aboutsummaryrefslogtreecommitdiff
path: root/azalea-physics/src/collision
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-09-04 23:01:15 -0500
committermat <github@matdoes.dev>2022-09-04 23:01:15 -0500
commit4f00ddace08bd5ad17500a405f55554dff343be7 (patch)
tree8a8503fe4b9d0055b73952d2fb7f38941000f9d0 /azalea-physics/src/collision
parent99fcad7bc4133c32627fe2e4751faad05b9b4ef1 (diff)
downloadazalea-drasl-4f00ddace08bd5ad17500a405f55554dff343be7.tar.xz
remove some debug stuff and fix recipe packet
Diffstat (limited to 'azalea-physics/src/collision')
-rw-r--r--azalea-physics/src/collision/mod.rs15
-rw-r--r--azalea-physics/src/collision/shape.rs14
2 files changed, 0 insertions, 29 deletions
diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs
index 794f707b..1f9064b3 100644
--- a/azalea-physics/src/collision/mod.rs
+++ b/azalea-physics/src/collision/mod.rs
@@ -57,7 +57,6 @@ impl HasCollision for Dimension {
// }
fn collide(&self, movement: &Vec3, entity: &EntityData) -> Vec3 {
let entity_bounding_box = entity.bounding_box;
- println!("collide: entity_bounding_box: {:?}", entity_bounding_box);
// TODO: get_entity_collisions
// let entity_collisions = dimension.get_entity_collisions(self, entity_bounding_box.expand_towards(movement));
let entity_collisions = Vec::new();
@@ -107,14 +106,10 @@ impl MovableEntity for EntityMut<'_> {
// movement = this.maybeBackOffFromEdge(movement, moverType);
- println!("move_entity {:?}", movement);
-
let collide_result = { self.dimension.collide(movement, self) };
let move_distance = collide_result.length_sqr();
- println!("move_entity move_distance: {}", move_distance);
-
if move_distance > EPSILON {
// TODO: fall damage
@@ -128,8 +123,6 @@ impl MovableEntity for EntityMut<'_> {
};
self.dimension.set_entity_pos(self.id, new_pos)?;
-
- println!("move_entity set_entity_pos {:?}", new_pos)
}
let x_collision = movement.x != collide_result.x;
@@ -139,11 +132,6 @@ impl MovableEntity for EntityMut<'_> {
let on_ground = vertical_collision && movement.y < 0.;
// self.on_ground = on_ground;
- println!(
- "move_entity {} {} {}",
- x_collision, z_collision, vertical_collision
- );
-
// TODO: minecraft checks for a "minor" horizontal collision here
let _block_pos_below = self.on_pos_legacy();
@@ -152,7 +140,6 @@ impl MovableEntity for EntityMut<'_> {
// .get_block_state(&block_pos_below)
// .expect("Couldn't get block state below");
- println!("move_entity 4");
// self.check_fall_damage(collide_result.y, on_ground, block_state_below, block_pos_below);
// if self.isRemoved() { return; }
@@ -196,8 +183,6 @@ impl MovableEntity for EntityMut<'_> {
// this.setRemainingFireTicks(-this.getFireImmuneTicks());
// }
- println!("move_entity 5");
-
Ok(())
}
}
diff --git a/azalea-physics/src/collision/shape.rs b/azalea-physics/src/collision/shape.rs
index c8428a08..d229a25d 100644
--- a/azalea-physics/src/collision/shape.rs
+++ b/azalea-physics/src/collision/shape.rs
@@ -47,12 +47,6 @@ pub trait VoxelShape {
return empty_shape();
}
- println!(
- "making new voxel shape {:?} {:?} {:?}",
- self.get_coords(Axis::X),
- self.get_coords(Axis::Y),
- self.get_coords(Axis::Z)
- );
Box::new(ArrayVoxelShape::new(
self.shape(),
@@ -68,12 +62,6 @@ pub trait VoxelShape {
fn find_index(&self, axis: Axis, coord: f64) -> i32 {
let r = binary_search(0, (self.shape().size(axis) + 1) as i32, &|t| {
- println!(
- "checking {} ({}) against {}",
- t,
- self.get(axis, t as usize),
- coord
- );
coord < self.get(axis, t as usize)
}) - 1;
r
@@ -123,7 +111,6 @@ pub trait VoxelShape {
);
let var19 = self.shape().size(x_axis);
- println!("movement: {}", movement);
if movement > 0. {
for var20 in var14 + 1..(var19 as i32) {
for var21 in var15..var16 {
@@ -144,7 +131,6 @@ pub trait VoxelShape {
}
}
} else if movement < 0. {
- println!("hmmm var13={}", var13);
if var13 > 0 {
for var20 in (var13 - 1)..=0 {
for var21 in var15..var16 {