Relintai/godot_voxel
1
0
Fork 0
mirror of https://github.com/Relintai/godot_voxel.git synced 2025-01-09 04:59:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix block processors' sorting function

Browse Source
This commit is contained in:
Marc Gilleron 2019-05-12 16:19:08 +01:00
parent 1065aa40ef
commit 8126d732b6
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
terrain/voxel_mesh_updater.cpp
View File

@ -247,9 +247,16 @@ void VoxelMeshUpdater::process_block(const InputBlock &block, OutputBlock &outpu
// Sorts distance to viewer // Sorts distance to viewer
// The closest block will be the first one in the array // The closest block will be the first one in the array
struct BlockUpdateComparator { struct BlockUpdateComparator {
Vector3i center; Vector3i center; // In LOD0 block coordinates
inline bool operator()(const VoxelMeshUpdater::InputBlock &a, const VoxelMeshUpdater::InputBlock &b) const { inline bool operator()(const VoxelMeshUpdater::InputBlock &a, const VoxelMeshUpdater::InputBlock &b) const {
return a.position.distance_sq(center) < b.position.distance_sq(center); if (a.lod == b.lod) {
int da = (a.position * (1 << a.lod)).distance_sq(center);
int db = (b.position * (1 << b.lod)).distance_sq(center);
return da < db;
} else {
// Load highest lods first because they are needed for the octree to subdivide
return a.lod > b.lod;
}
} }
}; };

5
terrain/voxel_provider_thread.cpp
View File

@ -153,9 +153,14 @@ struct BlockPositionComparator {
// In LOD0 block coordinates // In LOD0 block coordinates
Vector3i center; Vector3i center;
inline bool operator()(const VoxelProviderThread::EmergeInput &a, const VoxelProviderThread::EmergeInput &b) const { inline bool operator()(const VoxelProviderThread::EmergeInput &a, const VoxelProviderThread::EmergeInput &b) const {
if (a.lod == b.lod) {
int da = (a.block_position * (1 << a.lod)).distance_sq(center); int da = (a.block_position * (1 << a.lod)).distance_sq(center);
int db = (b.block_position * (1 << b.lod)).distance_sq(center); int db = (b.block_position * (1 << b.lod)).distance_sq(center);
return da < db; return da < db;
} else {
// Load highest lods first because they are needed for the octree to subdivide
return a.lod > b.lod;
}
} }
}; };