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 potential issue, the block state being checked was always the same

Browse Source
This commit is contained in:
Marc Gilleron 2018-09-30 23:32:01 +01:00
parent da0a1a058c
commit f05762b683
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
voxel_map.cpp
View File

@ -76,6 +76,7 @@ VoxelBlock *VoxelMap::get_block(Vector3i bpos) {
VoxelBlock **p = _blocks.getptr(bpos); VoxelBlock **p = _blocks.getptr(bpos);
if (p) { if (p) {
_last_accessed_block = *p; _last_accessed_block = *p;
CRASH_COND(_last_accessed_block == NULL); // The map should not contain null blocks
return _last_accessed_block; return _last_accessed_block;
} }
return NULL; return NULL;

18
voxel_terrain.cpp
View File

@ -554,6 +554,7 @@ void VoxelTerrain::_process() {
time_before = os.get_ticks_usec(); time_before = os.get_ticks_usec();
// Get block loading responses // Get block loading responses
// Note: if block loading is too fast, this can cause stutters. It should only happen on first load, though.
{ {
const unsigned int bs = _map->get_block_size(); const unsigned int bs = _map->get_block_size();
const Vector3i block_size(bs, bs, bs); const Vector3i block_size(bs, bs, bs);
@ -570,11 +571,13 @@ void VoxelTerrain::_process() {
const VoxelProviderThread::EmergeOutput &o = output.emerged_blocks[i]; const VoxelProviderThread::EmergeOutput &o = output.emerged_blocks[i];
Vector3i block_pos = _map->voxel_to_block(o.origin_in_voxels); Vector3i block_pos = _map->voxel_to_block(o.origin_in_voxels);
VoxelTerrain::BlockDirtyState *state = _dirty_blocks.getptr(block_pos); {
if(state == NULL || *state != BLOCK_LOAD) { VoxelTerrain::BlockDirtyState *state = _dirty_blocks.getptr(block_pos);
// That block was not requested, drop it if(state == NULL || *state != BLOCK_LOAD) {
++_stats.dropped_provider_blocks; // That block was not requested, drop it
continue; ++_stats.dropped_provider_blocks;
continue;
}
} }
// Check return // Check return
@ -589,9 +592,8 @@ void VoxelTerrain::_process() {
// Trigger mesh updates // Trigger mesh updates
if (update_neighbors) { if (update_neighbors) {
// All neighbors have to be checked // All neighbors have to be checked. If they are now surrounded, they can be updated
Vector3i ndir; Vector3i ndir;
// TODO Cache blocks in a small local grid on the stack to reduce hashing
for (ndir.z = -1; ndir.z < 2; ++ndir.z) { for (ndir.z = -1; ndir.z < 2; ++ndir.z) {
for (ndir.x = -1; ndir.x < 2; ++ndir.x) { for (ndir.x = -1; ndir.x < 2; ++ndir.x) {
for (ndir.y = -1; ndir.y < 2; ++ndir.y) { for (ndir.y = -1; ndir.y < 2; ++ndir.y) {
@ -599,6 +601,7 @@ void VoxelTerrain::_process() {
// TODO What if the map is really composed of empty blocks? // TODO What if the map is really composed of empty blocks?
if (_map->is_block_surrounded(npos)) { if (_map->is_block_surrounded(npos)) {
VoxelTerrain::BlockDirtyState *state = _dirty_blocks.getptr(npos);
if (state && *state == BLOCK_UPDATE_NOT_SENT) { if (state && *state == BLOCK_UPDATE_NOT_SENT) {
// Assuming it is scheduled to be updated already. // Assuming it is scheduled to be updated already.
// In case of BLOCK_UPDATE_SENT, we'll have to resend it. // In case of BLOCK_UPDATE_SENT, we'll have to resend it.
@ -611,6 +614,7 @@ void VoxelTerrain::_process() {
} }
} }
} }
} else { } else {
// Only update the block, neighbors will probably follow if needed // Only update the block, neighbors will probably follow if needed
_dirty_blocks[block_pos] = BLOCK_UPDATE_NOT_SENT; _dirty_blocks[block_pos] = BLOCK_UPDATE_NOT_SENT;