curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-09 21:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

renaiming debug timers

Browse Source
This commit is contained in:
minjaesong
2021-07-29 10:23:32 +09:00
parent 6f09040174
commit 870e165cf6
4 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/torvald/terrarum/TitleScreen.kt
View File

@@ -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)
)
)
}

17
src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
View File

@@ -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)
)
)
}

19
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -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)
)
)
}

11
src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt
View File

@@ -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) {