diff --git a/project/blocky_game/debug_info.gd b/project/blocky_game/debug_info.gd index b1add32..af1be34 100644 --- a/project/blocky_game/debug_info.gd +++ b/project/blocky_game/debug_info.gd @@ -7,18 +7,18 @@ func _process(delta): var dm = OS.get_dynamic_memory_usage() var sm = OS.get_static_memory_usage() - var stats = _terrain.get_statistics() - DDD.set_text("Dynamic memory", _format_memory(dm)) DDD.set_text("Static memory", _format_memory(sm)) - for i in len(stats.stream.remaining_blocks_per_thread): - DDD.set_text(str("Stream[", i, "]"), stats.stream.remaining_blocks_per_thread[i]) + var global_stats = VoxelServer.get_stats() + for p in [[global_stats.streaming, "streaming_"], [global_stats.meshing, "meshing_"]]: + var pool_stats = p[0] + var prefix = p[1] + for k in pool_stats: + DDD.set_text(str(prefix, k), pool_stats[k]) - for i in len(stats.updater.remaining_blocks_per_thread): - DDD.set_text(str("Updater[", i, "]"), stats.updater.remaining_blocks_per_thread[i]) - - DDD.set_text("Main thread block updates", stats.remaining_main_thread_blocks) + var terrain_stats = _terrain.get_statistics() + DDD.set_text("Main thread block updates", terrain_stats.remaining_main_thread_blocks) static func _format_memory(m): diff --git a/project/blocky_terrain/debug_info.gd b/project/blocky_terrain/debug_info.gd index b1add32..af1be34 100644 --- a/project/blocky_terrain/debug_info.gd +++ b/project/blocky_terrain/debug_info.gd @@ -7,18 +7,18 @@ func _process(delta): var dm = OS.get_dynamic_memory_usage() var sm = OS.get_static_memory_usage() - var stats = _terrain.get_statistics() - DDD.set_text("Dynamic memory", _format_memory(dm)) DDD.set_text("Static memory", _format_memory(sm)) - for i in len(stats.stream.remaining_blocks_per_thread): - DDD.set_text(str("Stream[", i, "]"), stats.stream.remaining_blocks_per_thread[i]) + var global_stats = VoxelServer.get_stats() + for p in [[global_stats.streaming, "streaming_"], [global_stats.meshing, "meshing_"]]: + var pool_stats = p[0] + var prefix = p[1] + for k in pool_stats: + DDD.set_text(str(prefix, k), pool_stats[k]) - for i in len(stats.updater.remaining_blocks_per_thread): - DDD.set_text(str("Updater[", i, "]"), stats.updater.remaining_blocks_per_thread[i]) - - DDD.set_text("Main thread block updates", stats.remaining_main_thread_blocks) + var terrain_stats = _terrain.get_statistics() + DDD.set_text("Main thread block updates", terrain_stats.remaining_main_thread_blocks) static func _format_memory(m): diff --git a/project/smooth_terrain/main.gd b/project/smooth_terrain/main.gd index 1f6dec2..8de7a39 100644 --- a/project/smooth_terrain/main.gd +++ b/project/smooth_terrain/main.gd @@ -21,23 +21,20 @@ const _process_stat_names = [ func _process(delta): var stats = _terrain.get_statistics() - for i in len(stats.stream.remaining_blocks_per_thread): - var remaining = stats.stream.remaining_blocks_per_thread[i] - DDD.set_text(str("Loading blocks [", i, "]"), str(remaining)) - - for i in len(stats.updater.remaining_blocks_per_thread): - var remaining = stats.updater.remaining_blocks_per_thread[i] - DDD.set_text(str("Meshing blocks [", i, "]"), str(remaining)) - DDD.set_text("FPS", Engine.get_frames_per_second()) DDD.set_text("Main thread block updates", stats.remaining_main_thread_blocks) DDD.set_text("Static memory", _format_memory(OS.get_static_memory_usage())) DDD.set_text("Dynamic memory", _format_memory(OS.get_dynamic_memory_usage())) DDD.set_text("Blocked lods", stats.blocked_lods) - DDD.set_text("Load sort time", stats.stream.sorting_time) - DDD.set_text("Mesh sort time", stats.updater.sorting_time) DDD.set_text("Position", _avatar.translation) + var global_stats = VoxelServer.get_stats() + for p in [[global_stats.streaming, "streaming_"], [global_stats.meshing, "meshing_"]]: + var pool_stats = p[0] + var prefix = p[1] + for k in pool_stats: + DDD.set_text(str(prefix, k), pool_stats[k]) + for k in _process_stat_names: var v = stats[k] if k in _process_stats: