logaritmisk/rust-smb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some bugs with collision detection

Browse Source
This commit is contained in:
logaritmisk
2015-01-06 23:37:00 +01:00
parent ff9ab15240
commit 2d53866272
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main.rs
View File

@@ -2,6 +2,7 @@ extern crate sdl2;
use std::num::FloatMath; use std::num::FloatMath;
use std::iter::range_step_inclusive;
use sdl2::video::{Window, WindowPos, OPENGL}; use sdl2::video::{Window, WindowPos, OPENGL};
use sdl2::event::{poll_event, Event}; use sdl2::event::{poll_event, Event};
@@ -53,9 +54,12 @@ fn main() {
let colors = vec![Color::RGB(0, 0, 255), Color::RGB(0, 128, 255)]; let colors = vec![Color::RGB(0, 0, 255), Color::RGB(0, 128, 255)];
for x in range(0, 120) { for x in range(5, 120) {
layer.set_tile(x, 14, Tile::Floor(colors[(x % 2) as uint])); layer.set_tile(x, 14, Tile::Floor(colors[(x % 2) as uint]));
} }
for x in range(11, 20) {
layer.set_tile(x, 13, Tile::Floor(colors[(x % 2) as uint]));
}
let mut camera = Camera::new(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, layer.to_rect()); let mut camera = Camera::new(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, layer.to_rect());
@@ -110,6 +114,8 @@ fn main() {
while lag >= MS_PER_UPDATE { while lag >= MS_PER_UPDATE {
player.update(); player.update();
player.on_ground = false;
let intersecting = layer.find_intersecting(&player.to_rect()); let intersecting = layer.find_intersecting(&player.to_rect());
if player.dx > 0.0 { if player.dx > 0.0 {
@@ -118,13 +124,11 @@ fn main() {
let mut d_x = player.dx; let mut d_x = player.dx;
for y in range(intersecting.y, intersecting.y + intersecting.h + 1) { for y in range_step_inclusive(intersecting.y, intersecting.y + intersecting.h, 1) {
for x in range(t_x, t_x + 2) { for x in range_step_inclusive(t_x, t_x + 1, 1) {
match *layer.get_tile(x, y) { match *layer.get_tile(x, y) {
Tile::Empty => (), Tile::Empty => (),
Tile::Floor(_) => { Tile::Floor(_) => d_x = d_x.min((x * TILE_WIDTH) as f32 - p_x)
d_x = d_x.min((x * TILE_WIDTH) as f32 - p_x);
}
} }
} }
} }
@@ -140,13 +144,11 @@ fn main() {
let mut d_x = player.dx; let mut d_x = player.dx;
for y in range(intersecting.y, intersecting.y + intersecting.h + 1) { for y in range_step_inclusive(intersecting.y, intersecting.y + intersecting.h, 1) {
for x in range(t_x, t_x + 2) { for x in range_step_inclusive(t_x, t_x - 1, -1) {
match *layer.get_tile(x, y) { match *layer.get_tile(x, y) {
Tile::Empty => (), Tile::Empty => (),
Tile::Floor(_) => { Tile::Floor(_) => d_x = d_x.max((x * TILE_WIDTH + TILE_WIDTH) as f32 - p_x)
d_x = d_x.min((x * TILE_WIDTH) as f32 - p_x);
}
} }
} }
} }
@@ -164,13 +166,11 @@ fn main() {
let mut d_y = player.dy; let mut d_y = player.dy;
for y in range(t_y, t_y + 2) { for y in range_step_inclusive(t_y, t_y + 1, 1) {
for x in range(intersecting.x, intersecting.x + intersecting.w + 1) { for x in range_step_inclusive(intersecting.x, intersecting.x + intersecting.w, 1) {
match *layer.get_tile(x, y) { match *layer.get_tile(x, y) {
Tile::Empty => (), Tile::Empty => (),
Tile::Floor(_) => { Tile::Floor(_) => d_y = d_y.min((y * TILE_HEIGHT) as f32 - p_y)
d_y = d_y.min((y * TILE_HEIGHT) as f32 - p_y);
}
} }
} }
} }
@@ -188,13 +188,11 @@ fn main() {
let mut d_y = player.dy; let mut d_y = player.dy;
for y in range(t_y, t_y + 2) { for y in range_step_inclusive(t_y, t_y - 1, -1) {
for x in range(intersecting.x, intersecting.x + intersecting.w + 1) { for x in range_step_inclusive(intersecting.x, intersecting.x + intersecting.w, 1) {
match *layer.get_tile(x, y) { match *layer.get_tile(x, y) {
Tile::Empty => (), Tile::Empty => (),
Tile::Floor(_) => { Tile::Floor(_) => d_y = d_y.max((y * TILE_HEIGHT + TILE_HEIGHT) as f32 - p_y)
d_y = d_y.min((y * TILE_HEIGHT) as f32 - p_y);
}
} }
} }
} }