Zylann
/
godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename statistic property back to its old name, I think it didnt need to change

master
Marc Gilleron 2021-01-16 13:05:50 +00:00
parent 029e364007
commit 94810f4d04
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/terrain/voxel_terrain_editor_plugin.cpp
View File

@ -118,11 +118,11 @@ void VoxelTerrainEditorPlugin::_notification(int p_what) {
int main_thread_tasks = 0; int main_thread_tasks = 0;
VoxelLodTerrain *vlt = Object::cast_to<VoxelLodTerrain>(_node); VoxelLodTerrain *vlt = Object::cast_to<VoxelLodTerrain>(_node);
if (vlt != nullptr) { if (vlt != nullptr) {
main_thread_tasks = vlt->get_stats().pending_block_meshes; main_thread_tasks = vlt->get_stats().remaining_main_thread_blocks;
} else { } else {
VoxelTerrain *vt = Object::cast_to<VoxelTerrain>(_node); VoxelTerrain *vt = Object::cast_to<VoxelTerrain>(_node);
if (vt != nullptr) { if (vt != nullptr) {
main_thread_tasks = vt->get_stats().pending_block_meshes; main_thread_tasks = vt->get_stats().remaining_main_thread_blocks;
} }
} }
_task_indicator->update_stats(main_thread_tasks); _task_indicator->update_stats(main_thread_tasks);

4
terrain/voxel_lod_terrain.cpp
View File

@ -1273,7 +1273,7 @@ void VoxelLodTerrain::_process() {
shift_up(_reception_buffers.mesh_output, queue_index); shift_up(_reception_buffers.mesh_output, queue_index);
} }
_stats.pending_block_meshes = (int)_reception_buffers.mesh_output.size(); _stats.remaining_main_thread_blocks = (int)_reception_buffers.mesh_output.size();
} }
_stats.time_process_update_responses = profiling_clock.restart(); _stats.time_process_update_responses = profiling_clock.restart();
@ -1524,7 +1524,7 @@ Dictionary VoxelLodTerrain::_b_get_statistics() const {
d["time_request_blocks_to_update"] = _stats.time_request_blocks_to_update; d["time_request_blocks_to_update"] = _stats.time_request_blocks_to_update;
d["time_process_update_responses"] = _stats.time_process_update_responses; d["time_process_update_responses"] = _stats.time_process_update_responses;
d["pending_block_meshes"] = _stats.pending_block_meshes; d["remaining_main_thread_blocks"] = _stats.remaining_main_thread_blocks;
d["dropped_block_loads"] = _stats.dropped_block_loads; d["dropped_block_loads"] = _stats.dropped_block_loads;
d["dropped_block_meshs"] = _stats.dropped_block_meshs; d["dropped_block_meshs"] = _stats.dropped_block_meshs;
d["updated_blocks"] = _stats.updated_blocks; d["updated_blocks"] = _stats.updated_blocks;

2
terrain/voxel_lod_terrain.h
View File

@ -86,7 +86,7 @@ public:
int updated_blocks = 0; int updated_blocks = 0;
int dropped_block_loads = 0; int dropped_block_loads = 0;
int dropped_block_meshs = 0; int dropped_block_meshs = 0;
int pending_block_meshes = 0; int remaining_main_thread_blocks = 0;
uint64_t time_detect_required_blocks = 0; uint64_t time_detect_required_blocks = 0;
uint64_t time_request_blocks_to_load = 0; uint64_t time_request_blocks_to_load = 0;
uint64_t time_process_load_responses = 0; uint64_t time_process_load_responses = 0;

4
terrain/voxel_terrain.cpp
View File

@ -423,7 +423,7 @@ Dictionary VoxelTerrain::_b_get_statistics() const {
d["dropped_block_loads"] = _stats.dropped_block_loads; d["dropped_block_loads"] = _stats.dropped_block_loads;
d["dropped_block_meshs"] = _stats.dropped_block_meshs; d["dropped_block_meshs"] = _stats.dropped_block_meshs;
d["updated_blocks"] = _stats.updated_blocks; d["updated_blocks"] = _stats.updated_blocks;
d["pending_block_meshes"] = _stats.pending_block_meshes; d["remaining_main_thread_blocks"] = _stats.remaining_main_thread_blocks;
return d; return d;
} }
@ -1239,7 +1239,7 @@ void VoxelTerrain::_process() {
shift_up(_reception_buffers.mesh_output, queue_index); shift_up(_reception_buffers.mesh_output, queue_index);
_stats.pending_block_meshes = _reception_buffers.mesh_output.size(); _stats.remaining_main_thread_blocks = _reception_buffers.mesh_output.size();
} }
_stats.time_process_update_responses = profiling_clock.restart(); _stats.time_process_update_responses = profiling_clock.restart();

2
terrain/voxel_terrain.h
View File

@ -66,7 +66,7 @@ public:
int updated_blocks = 0; int updated_blocks = 0;
int dropped_block_loads = 0; int dropped_block_loads = 0;
int dropped_block_meshs = 0; int dropped_block_meshs = 0;
int pending_block_meshes = 0; int remaining_main_thread_blocks = 0;
uint64_t time_detect_required_blocks = 0; uint64_t time_detect_required_blocks = 0;
uint64_t time_request_blocks_to_load = 0; uint64_t time_request_blocks_to_load = 0;
uint64_t time_process_load_responses = 0; uint64_t time_process_load_responses = 0;