Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-25 21:25:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix world to voxel calculations when the voxel scale is not 1.

Browse Source
This commit is contained in:
Relintai 2020-05-19 00:50:19 +02:00
parent edce32b190
commit 703acd1b56
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
world/voxel_world.cpp
View File

@ -605,13 +605,13 @@ uint8_t VoxelWorld::get_voxel_at_world_position(const Vector3 &world_position, c
Vector3 pos = world_position / get_voxel_scale(); Vector3 pos = world_position / get_voxel_scale();
//Note: floor is needed to handle negative numbers proiberly //Note: floor is needed to handle negative numbers proiberly
int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x() / get_voxel_scale())); int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x()));
int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y() / get_voxel_scale())); int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y()));
int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z() / get_voxel_scale())); int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z()));
int bx = static_cast<int>(Math::floor(pos.x / get_voxel_scale())) % get_chunk_size_x(); int bx = static_cast<int>(Math::floor(pos.x)) % get_chunk_size_x();
int by = static_cast<int>(Math::floor(pos.y / get_voxel_scale())) % get_chunk_size_y(); int by = static_cast<int>(Math::floor(pos.y)) % get_chunk_size_y();
int bz = static_cast<int>(Math::floor(pos.z / get_voxel_scale())) % get_chunk_size_z(); int bz = static_cast<int>(Math::floor(pos.z)) % get_chunk_size_z();
if (bx < 0) { if (bx < 0) {
bx += get_chunk_size_x(); bx += get_chunk_size_x();
@ -637,13 +637,13 @@ void VoxelWorld::set_voxel_at_world_position(const Vector3 &world_position, cons
Vector3 pos = world_position / get_voxel_scale(); Vector3 pos = world_position / get_voxel_scale();
//Note: floor is needed to handle negative numbers proiberly //Note: floor is needed to handle negative numbers proiberly
int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x() / get_voxel_scale())); int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x()));
int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y() / get_voxel_scale())); int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y()));
int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z() / get_voxel_scale())); int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z()));
int bx = static_cast<int>(Math::floor(pos.x / get_voxel_scale())) % get_chunk_size_x(); int bx = static_cast<int>(Math::floor(pos.x)) % get_chunk_size_x();
int by = static_cast<int>(Math::floor(pos.y / get_voxel_scale())) % get_chunk_size_y(); int by = static_cast<int>(Math::floor(pos.y)) % get_chunk_size_y();
int bz = static_cast<int>(Math::floor(pos.z / get_voxel_scale())) % get_chunk_size_z(); int bz = static_cast<int>(Math::floor(pos.z)) % get_chunk_size_z();
if (bx < 0) { if (bx < 0) {
bx += get_chunk_size_x(); bx += get_chunk_size_x();
@ -706,9 +706,9 @@ Ref<VoxelChunk> VoxelWorld::get_chunk_at_world_position(const Vector3 &world_pos
Vector3 pos = world_position / get_voxel_scale(); Vector3 pos = world_position / get_voxel_scale();
//Note: floor is needed to handle negative numbers proiberly //Note: floor is needed to handle negative numbers proiberly
int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x() / get_voxel_scale())); int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x()));
int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y() / get_voxel_scale())); int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y()));
int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z() / get_voxel_scale())); int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z()));
return get_chunk(x, y, z); return get_chunk(x, y, z);
} }
@ -716,9 +716,9 @@ Ref<VoxelChunk> VoxelWorld::get_or_create_chunk_at_world_position(const Vector3
Vector3 pos = world_position / get_voxel_scale(); Vector3 pos = world_position / get_voxel_scale();
//Note: floor is needed to handle negative numbers proiberly //Note: floor is needed to handle negative numbers proiberly
int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x() / get_voxel_scale())); int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x()));
int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y() / get_voxel_scale())); int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y()));
int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z() / get_voxel_scale())); int z = static_cast<int>(Math::floor(pos.z / get_chunk_size_z()));
return get_or_create_chunk(x, y, z); return get_or_create_chunk(x, y, z);
} }