mat/azalea
1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 14:26:04 +00:00
Code Issues Projects Releases Packages Activity

fix CubeVoxelShape::find_index

Browse source
This commit is contained in:
mat 2025-06-02 23:44:49 -09:00
parent cc3e64a315
commit 415c0d873e
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
azalea-physics/src/collision/shape.rs
View file

@ -399,8 +399,13 @@ impl VoxelShape {
} }
pub fn find_index(&self, axis: Axis, coord: f64) -> i32 { pub fn find_index(&self, axis: Axis, coord: f64) -> i32 {
let upper_limit = (self.shape().size(axis) + 1) as i32; match self {
binary_search(0, upper_limit, |t| coord < self.get(axis, t as usize)) - 1 VoxelShape::Cube(s) => s.find_index(axis, coord),
_ => {
let upper_limit = (self.shape().size(axis) + 1) as i32;
binary_search(0, upper_limit, |t| coord < self.get(axis, t as usize)) - 1
}
}
} }
pub fn clip(&self, from: &Vec3, to: &Vec3, block_pos: &BlockPos) -> Option<BlockHitResult> { pub fn clip(&self, from: &Vec3, to: &Vec3, block_pos: &BlockPos) -> Option<BlockHitResult> {
@ -669,11 +674,10 @@ impl CubeVoxelShape {
axis.choose(&self.x_coords, &self.y_coords, &self.z_coords) axis.choose(&self.x_coords, &self.y_coords, &self.z_coords)
} }
// unused fn find_index(&self, axis: Axis, coord: f64) -> i32 {
// fn find_index(&self, axis: Axis, coord: f64) -> i32 { let n = self.shape().size(axis);
// let n = self.shape().size(axis); f64::floor(f64::clamp(coord * (n as f64), -1f64, n as f64)) as i32
// (f64::clamp(coord * (n as f64), -1f64, n as f64)) as i32 }
// }
} }
#[derive(Debug)] #[derive(Debug)]