Jayrude
/
voxel-rs
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

grid_pos_to_world_pos now handles negative grid positions

This commit is contained in:
Jarrod Doyle 2023-07-27 21:34:38 +01:00
parent 26f66813dd
commit 34bcae4693
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/voxel/brickmap.rs
View File

@ -239,7 +239,7 @@ impl BrickmapManager {
// The CPU side World uses different terminology and coordinate system // The CPU side World uses different terminology and coordinate system
// We need to convert between Brickmap and World pos and get the relevant // We need to convert between Brickmap and World pos and get the relevant
// World voxels // World voxels
let (chunk_pos, block_pos) = Self::grid_pos_to_world_pos(world, grid_pos); let (chunk_pos, block_pos) = Self::grid_pos_to_world_pos(world, grid_pos.as_ivec3());
let block = world.get_block(chunk_pos, block_pos); let block = world.get_block(chunk_pos, block_pos);
// The World gives us the full voxel data for the requested block of voxels. // The World gives us the full voxel data for the requested block of voxels.
@ -457,12 +457,14 @@ impl BrickmapManager {
fn grid_pos_to_world_pos( fn grid_pos_to_world_pos(
world: &mut super::world::WorldManager, world: &mut super::world::WorldManager,
grid_pos: glam::UVec3, grid_pos: glam::IVec3,
) -> (glam::IVec3, glam::UVec3) { ) -> (glam::IVec3, glam::UVec3) {
let chunk_dims = world.get_chunk_dims(); // We deal with dvecs here because we want a negative grid_pos to have floored
let chunk_pos = (grid_pos / chunk_dims).as_ivec3(); // chunk_pos
let block_pos = grid_pos % chunk_dims; let chunk_dims = world.get_chunk_dims().as_dvec3();
(chunk_pos, block_pos) let chunk_pos = (grid_pos.as_dvec3() / chunk_dims).floor();
let block_pos = grid_pos - (chunk_pos * chunk_dims).as_ivec3();
(chunk_pos.as_ivec3(), block_pos.as_uvec3())
} }
} }