_/minecrab
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 1 Wiki Activity

Fix player movement

Browse source
This commit is contained in:
Sijmen 2021-06-10 21:56:33 +02:00
parent 307cb748d5
commit 03781e3dc8
Signed by: vijfhoek
GPG key ID: 82D05C89B28B0DAE
1 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/player.rs
View file

@ -73,53 +73,54 @@ impl Player {
let mut new_position = self.view.camera.position; let mut new_position = self.view.camera.position;
// y component (jumping)
new_position.y += velocity.y;
if let Some(aabb) = self.check_collision(new_position, world) {
if self.up_speed < 0.0 {
new_position.y = aabb.min.y.ceil() + 1.62;
new_position.y = utils::f32_successor(new_position.y);
} else if self.up_speed > 0.0 {
new_position.y = aabb.max.y.floor() - 0.18;
new_position.y = utils::f32_predecessor(new_position.y);
}
self.up_speed = 0.0;
self.grounded = true;
} else {
self.grounded = false;
}
// x component
new_position.x += velocity.x;
if let Some(aabb) = self.check_collision(new_position, world) {
if velocity.x < 0.0 {
new_position.x = aabb.min.x.ceil() + 0.3;
new_position.x = utils::f32_successor(new_position.x);
} else if velocity.x > 0.0 {
new_position.x = aabb.max.x.floor() - 0.3;
new_position.x = utils::f32_predecessor(new_position.x);
}
}
// z component
new_position.z += velocity.z;
if let Some(aabb) = self.check_collision(new_position, world) {
if velocity.z < 0.0 {
new_position.z = aabb.min.z.ceil() + 0.3;
new_position.z = utils::f32_successor(new_position.z);
} else if velocity.z > 0.0 {
new_position.z = aabb.max.z.floor() - 0.3;
new_position.z = utils::f32_predecessor(new_position.z);
}
}
self.view.camera.position = new_position;
if !self.creative { if !self.creative {
// y component (jumping)
new_position.y += velocity.y;
if let Some(aabb) = self.check_collision(new_position, world) {
if self.up_speed < 0.0 {
new_position.y = aabb.min.y.ceil() + 1.62;
new_position.y = utils::f32_successor(new_position.y);
} else if self.up_speed > 0.0 {
new_position.y = aabb.max.y.floor() - 0.18;
new_position.y = utils::f32_predecessor(new_position.y);
}
self.up_speed = 0.0;
self.grounded = true;
} else if self.up_speed.abs() > 0.05 {
self.grounded = false;
}
// x component
new_position.x += velocity.x;
if let Some(aabb) = self.check_collision(new_position, world) {
if velocity.x < 0.0 {
new_position.x = aabb.min.x.ceil() + 0.3;
new_position.x = utils::f32_successor(new_position.x);
} else if velocity.x > 0.0 {
new_position.x = aabb.max.x.floor() - 0.3;
new_position.x = utils::f32_predecessor(new_position.x);
}
}
// z component
new_position.z += velocity.z;
if let Some(aabb) = self.check_collision(new_position, world) {
if velocity.z < 0.0 {
new_position.z = aabb.min.z.ceil() + 0.3;
new_position.z = utils::f32_successor(new_position.z);
} else if velocity.z > 0.0 {
new_position.z = aabb.max.z.floor() - 0.3;
new_position.z = utils::f32_predecessor(new_position.z);
}
}
self.up_speed -= 1.6 * dt.as_secs_f32(); self.up_speed -= 1.6 * dt.as_secs_f32();
self.up_speed *= 0.98_f32.powf(dt.as_secs_f32() / 20.0); self.up_speed *= 0.98_f32.powf(dt.as_secs_f32() / 20.0);
} else {
new_position += velocity;
} }
self.view.camera.position = new_position;
} }
fn check_collision(&self, position: Point3<f32>, world: &World) -> Option<Aabb> { fn check_collision(&self, position: Point3<f32>, world: &World) -> Option<Aabb> {