From 870e165cf6b12d4fa0d35634499b52235af846d2 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 29 Jul 2021 10:23:32 +0900 Subject: [PATCH] renaiming debug timers --- src/net/torvald/terrarum/TitleScreen.kt | 17 ++++++++++++----- .../terrarum/modulebasegame/BuildingMaker.kt | 17 ++++++++++++----- .../terrarum/modulebasegame/TerrarumIngame.kt | 19 +++++++++++++------ .../terrarum/worlddrawer/BlocksDrawerNew.kt | 11 +++++++---- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index 900e4bb78..2d1fbbe64 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -199,17 +199,24 @@ class TitleScreen(batch: SpriteBatch) : IngameInstance(batch) { var i = 0L while (updateAkku >= updateRate) { - AppLoader.measureDebugTime("Ingame.update") { updateScreen(updateRate) } + AppLoader.measureDebugTime("Ingame.Update") { updateScreen(updateRate) } updateAkku -= updateRate i += 1 } - AppLoader.setDebugTime("Ingame.updateCounter", i) + AppLoader.setDebugTime("Ingame.UpdateCounter", i) // render? just do it anyway - AppLoader.measureDebugTime("Ingame.render") { renderScreen() } - AppLoader.setDebugTime("Ingame.render-Light", - ((AppLoader.debugTimers["Ingame.render"] as? Long) ?: 0) - ((AppLoader.debugTimers["Renderer.LightTotal"] as? Long) ?: 0) + AppLoader.measureDebugTime("Ingame.Render") { renderScreen() } + AppLoader.setDebugTime("Ingame.Render - (Light + Tiling)", + ((AppLoader.debugTimers["Ingame.Render"] as? Long) ?: 0) - + ( + ((AppLoader.debugTimers["Renderer.Lanterns"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightPrecalc"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightRuns"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightToScreen"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.Tiling"] as? Long) ?: 0) + ) ) } diff --git a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt index ad080e9c9..6365a221b 100644 --- a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt +++ b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt @@ -319,16 +319,23 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) { var i = 0L while (updateAkku >= updateRate) { - AppLoader.measureDebugTime("Ingame.update") { updateGame(updateRate) } + AppLoader.measureDebugTime("Ingame.Update") { updateGame(updateRate) } updateAkku -= updateRate i += 1 } - AppLoader.setDebugTime("Ingame.updateCounter", i) + AppLoader.setDebugTime("Ingame.UpdateCounter", i) // render? just do it anyway - AppLoader.measureDebugTime("Ingame.render") { renderGame() } - AppLoader.setDebugTime("Ingame.render-Light", - (AppLoader.debugTimers["Ingame.render"] as Long) - ((AppLoader.debugTimers["Renderer.LightTotal"] as? Long) ?: 0) + AppLoader.measureDebugTime("Ingame.Render") { renderGame() } + AppLoader.setDebugTime("Ingame.Render - (Light + Tiling)", + ((AppLoader.debugTimers["Ingame.Render"] as? Long) ?: 0) - + ( + ((AppLoader.debugTimers["Renderer.Lanterns"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightPrecalc"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightRuns"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightToScreen"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.Tiling"] as? Long) ?: 0) + ) ) } diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt index ea54a3704..e1ad04b98 100644 --- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt +++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt @@ -394,7 +394,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) { // these need to appear on top of any others uiContainer.add(notifier) - AppLoader.setDebugTime("Ingame.updateCounter", 0) + AppLoader.setDebugTime("Ingame.UpdateCounter", 0) // some sketchy test code here @@ -503,18 +503,25 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) { var i = 0L while (updateAkku >= updateRate) { - AppLoader.measureDebugTime("Ingame.update") { updateGame(updateRate) } + AppLoader.measureDebugTime("Ingame.Update") { updateGame(updateRate) } updateAkku -= updateRate i += 1 } - AppLoader.setDebugTime("Ingame.updateCounter", i) + AppLoader.setDebugTime("Ingame.UpdateCounter", i) /** RENDER CODE GOES HERE */ - AppLoader.measureDebugTime("Ingame.render") { renderGame() } - AppLoader.setDebugTime("Ingame.render-Light", - (AppLoader.debugTimers["Ingame.render"] as Long) - ((AppLoader.debugTimers["Renderer.LightTotal"] as? Long) ?: 0) + AppLoader.measureDebugTime("Ingame.Render") { renderGame() } + AppLoader.setDebugTime("Ingame.Render - (Light + Tiling)", + ((AppLoader.debugTimers["Ingame.Render"] as? Long) ?: 0) - + ( + ((AppLoader.debugTimers["Renderer.Lanterns"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightPrecalc"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightRuns"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.LightToScreen"] as? Long) ?: 0) + + ((AppLoader.debugTimers["Renderer.Tiling"] as? Long) ?: 0) + ) ) } diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt index 64e1a376f..5bc1d401a 100644 --- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt +++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.* import com.badlogic.gdx.math.Matrix4 import com.jme3.math.FastMath import net.torvald.terrarum.* +import net.torvald.terrarum.AppLoader.measureDebugTime import net.torvald.terrarum.AppLoader.printdbg import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.blockproperties.Block @@ -186,10 +187,12 @@ internal object BlocksDrawer { } catch (e: ClassCastException) { } - drawTiles(WALL) - drawTiles(TERRAIN) // regular tiles - drawTiles(WIRE) - drawTiles(FLUID) + measureDebugTime("Renderer.Tiling") { + drawTiles(WALL) + drawTiles(TERRAIN) // regular tiles + drawTiles(WIRE) + drawTiles(FLUID) + } } internal fun drawWall(projectionMatrix: Matrix4, drawGlow: Boolean) {