diff options
Diffstat (limited to 'azalea-core')
| -rwxr-xr-x | azalea-core/src/aabb.rs | 70 | ||||
| -rwxr-xr-x | azalea-core/src/delta.rs | 4 | ||||
| -rwxr-xr-x | azalea-core/src/direction.rs | 2 | ||||
| -rwxr-xr-x | azalea-core/src/position.rs | 25 |
4 files changed, 64 insertions, 37 deletions
diff --git a/azalea-core/src/aabb.rs b/azalea-core/src/aabb.rs index fe45c35e..6796e79c 100755 --- a/azalea-core/src/aabb.rs +++ b/azalea-core/src/aabb.rs @@ -26,26 +26,26 @@ pub struct ClipPointOpts<'a> { } impl AABB { - pub fn contract(&self, x: f64, y: f64, z: f64) -> AABB { + pub fn contract(&self, amount: Vec3) -> AABB { let mut min = self.min; let mut max = self.max; - if x < 0.0 { - min.x -= x; - } else if x > 0.0 { - max.x -= x; + if amount.x < 0.0 { + min.x -= amount.x; + } else if amount.x > 0.0 { + max.x -= amount.x; } - if y < 0.0 { - min.y -= y; - } else if y > 0.0 { - max.y -= y; + if amount.y < 0.0 { + min.y -= amount.y; + } else if amount.y > 0.0 { + max.y -= amount.y; } - if z < 0.0 { - min.z -= z; - } else if z > 0.0 { - max.z -= z; + if amount.z < 0.0 { + min.z -= amount.z; + } else if amount.z > 0.0 { + max.z -= amount.z; } AABB { min, max } @@ -84,20 +84,23 @@ impl AABB { } } - pub fn inflate(&self, x: f64, y: f64, z: f64) -> AABB { - let min_x = self.min.x - x; - let min_y = self.min.y - y; - let min_z = self.min.z - z; + pub fn inflate(&self, amount: Vec3) -> AABB { + let min_x = self.min.x - amount.x; + let min_y = self.min.y - amount.y; + let min_z = self.min.z - amount.z; - let max_x = self.max.x + x; - let max_y = self.max.y + y; - let max_z = self.max.z + z; + let max_x = self.max.x + amount.x; + let max_y = self.max.y + amount.y; + let max_z = self.max.z + amount.z; AABB { min: Vec3::new(min_x, min_y, min_z), max: Vec3::new(max_x, max_y, max_z), } } + pub fn inflate_all(&self, amount: f64) -> AABB { + self.inflate(Vec3::new(amount, amount, amount)) + } pub fn intersect(&self, other: &AABB) -> AABB { let min_x = self.min.x.max(other.min.x); @@ -144,17 +147,17 @@ impl AABB { && self.min.z < other.max.z && self.max.z > other.min.z } - pub fn intersects_vec3(&self, other: &Vec3, other2: &Vec3) -> bool { + pub fn intersects_vec3(&self, corner1: &Vec3, corner2: &Vec3) -> bool { self.intersects_aabb(&AABB { min: Vec3::new( - other.x.min(other2.x), - other.y.min(other2.y), - other.z.min(other2.z), + corner1.x.min(corner2.x), + corner1.y.min(corner2.y), + corner1.z.min(corner2.z), ), max: Vec3::new( - other.x.max(other2.x), - other.y.max(other2.y), - other.z.max(other2.z), + corner1.x.max(corner2.x), + corner1.y.max(corner2.y), + corner1.z.max(corner2.z), ), }) } @@ -183,12 +186,11 @@ impl AABB { ) } - pub fn deflate(&mut self, x: f64, y: f64, z: f64) -> AABB { - self.inflate(-x, -y, -z) + pub fn deflate(&self, amount: Vec3) -> AABB { + self.inflate(Vec3::new(-amount.x, -amount.y, -amount.z)) } - - pub fn deflate_all(&mut self, amount: f64) -> AABB { - self.deflate(amount, amount, amount) + pub fn deflate_all(&self, amount: f64) -> AABB { + self.deflate(Vec3::new(amount, amount, amount)) } pub fn clip(&self, min: &Vec3, max: &Vec3) -> Option<Vec3> { @@ -434,11 +436,11 @@ impl AABB { let new_center = center + vector; for aabb in boxes { - let inflated = aabb.inflate( + let inflated = aabb.inflate(Vec3::new( self.get_size(Axis::X) * 0.5, self.get_size(Axis::Y) * 0.5, self.get_size(Axis::Z) * 0.5, - ); + )); if inflated.contains(&new_center) || inflated.contains(¢er) { return true; } diff --git a/azalea-core/src/delta.rs b/azalea-core/src/delta.rs index 238262a2..dd598f77 100755 --- a/azalea-core/src/delta.rs +++ b/azalea-core/src/delta.rs @@ -51,8 +51,8 @@ impl Vec3 { pub fn normalize(&self) -> Vec3 { let length = f64::sqrt(self.x * self.x + self.y * self.y + self.z * self.z); - if length < 1e-4 { - return Vec3::default(); + if length < 1e-5 { + return Vec3::ZERO; } Vec3 { x: self.x / length, diff --git a/azalea-core/src/direction.rs b/azalea-core/src/direction.rs index d458f487..656cab1b 100755 --- a/azalea-core/src/direction.rs +++ b/azalea-core/src/direction.rs @@ -17,9 +17,9 @@ pub enum Direction { impl Direction { pub const HORIZONTAL: [Direction; 4] = [ Direction::North, + Direction::East, Direction::South, Direction::West, - Direction::East, ]; pub const VERTICAL: [Direction; 2] = [Direction::Down, Direction::Up]; diff --git a/azalea-core/src/position.rs b/azalea-core/src/position.rs index cba58415..5d923d39 100755 --- a/azalea-core/src/position.rs +++ b/azalea-core/src/position.rs @@ -309,6 +309,21 @@ impl Vec3 { let z = self.z * (x_delta as f64) - self.x * (y_delta as f64); Vec3 { x, y, z } } + + pub fn to_block_pos_floor(&self) -> BlockPos { + BlockPos { + x: self.x.floor() as i32, + y: self.y.floor() as i32, + z: self.z.floor() as i32, + } + } + pub fn to_block_pos_ceil(&self) -> BlockPos { + BlockPos { + x: self.x.ceil() as i32, + y: self.y.ceil() as i32, + z: self.z.ceil() as i32, + } + } } /// The coordinates of a block in the world. For entities (if the coordinate @@ -600,6 +615,16 @@ impl From<ChunkSectionPos> for ChunkPos { ChunkPos { x: pos.x, z: pos.z } } } +impl From<&Vec3> for ChunkSectionPos { + fn from(pos: &Vec3) -> Self { + ChunkSectionPos::from(&BlockPos::from(pos)) + } +} +impl From<Vec3> for ChunkSectionPos { + fn from(pos: Vec3) -> Self { + ChunkSectionPos::from(&pos) + } +} impl From<&BlockPos> for ChunkBlockPos { #[inline] |