curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 02:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

wire actors to only update when wire change queue is not empty

Browse Source
This commit is contained in:
minjaesong
2021-08-22 00:42:52 +09:00
parent d315d61f68
commit b8e24d556e
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/ReferencingRanges.kt
View File

@@ -22,7 +22,7 @@ object ReferencingRanges {
// IDs doesn't effect the render order at all, but we're kinda enforcing these ID ranging. // IDs doesn't effect the render order at all, but we're kinda enforcing these ID ranging.
// However, these two wire-related actor will break the rule. But as we want them to render on top of others // However, these two wire-related actor will break the rule. But as we want them to render on top of others
// in the same render orders, we're giveng them relatively high IDs for them. // in the same render orders, we're giveng them relatively high IDs for them.
val ACTORS_WIRES = 0x7FFF_E000..0x7FFF_EFFF // Rendered front--wires val ACTORS_WIRES = 0x7FFF_C000..0x7FFF_EFFF // Rendered front--wires
val ACTORS_WIRES_HELPER = 0x7FFF_F000..0x7FFF_FF00 // Rendered overlay--wiring port icons and logic gates val ACTORS_WIRES_HELPER = 0x7FFF_F000..0x7FFF_FF00 // Rendered overlay--wiring port icons and logic gates
val ACTORS_OVERLAY = 0x7001_0000..0x7FFE_FFFF // Rendered as screen overlay, not affected by light nor environment overlays val ACTORS_OVERLAY = 0x7001_0000..0x7FFE_FFFF // Rendered as screen overlay, not affected by light nor environment overlays

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

@@ -6,8 +6,7 @@ import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.EMDASH import net.torvald.EMDASH
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.AppLoader.measureDebugTime import net.torvald.terrarum.AppLoader.*
import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.blockproperties.BlockPropUtil import net.torvald.terrarum.blockproperties.BlockPropUtil
@@ -188,6 +187,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
private set private set
var selectedWireRenderClass = "" var selectedWireRenderClass = ""
private var oldSelectedWireRenderClass = ""
@@ -539,16 +539,16 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
var i = 0L var i = 0L
while (updateAkku >= updateRate) { while (updateAkku >= updateRate) {
AppLoader.measureDebugTime("Ingame.Update") { updateGame(updateRate) } measureDebugTime("Ingame.Update") { updateGame(updateRate) }
updateAkku -= updateRate updateAkku -= updateRate
i += 1 i += 1
} }
AppLoader.setDebugTime("Ingame.UpdateCounter", i) setDebugTime("Ingame.UpdateCounter", i)
/** RENDER CODE GOES HERE */ /** RENDER CODE GOES HERE */
AppLoader.measureDebugTime("Ingame.Render") { renderGame() } measureDebugTime("Ingame.Render") { renderGame() }
} }
@@ -579,16 +579,23 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
/////////////////////////// ///////////////////////////
BlockPropUtil.dynamicLumFuncTickClock() BlockPropUtil.dynamicLumFuncTickClock()
world.updateWorldTime(delta) world.updateWorldTime(delta)
AppLoader.measureDebugTime("WorldSimulator.update") { measureDebugTime("WorldSimulator.update") {
WorldSimulator.invoke(actorNowPlaying, delta) WorldSimulator.invoke(actorNowPlaying, delta)
} }
AppLoader.measureDebugTime("WeatherMixer.update") { measureDebugTime("WeatherMixer.update") {
WeatherMixer.update(delta, actorNowPlaying, world) WeatherMixer.update(delta, actorNowPlaying, world)
} }
AppLoader.measureDebugTime("BlockStats.update") { measureDebugTime("BlockStats.update") {
BlockStats.update() BlockStats.update()
} }
// fill up visibleActorsRenderFront for wires, if:
// 1. something is cued on the wire change queue
// 2. wire renderclass changed
if (wireChangeQueue.isNotEmpty() || selectedWireRenderClass != oldSelectedWireRenderClass) {
measureDebugTime("Ingame.FillUpWiresBuffer") {
fillUpWiresBuffer()
}
}
//////////////////////////// ////////////////////////////
@@ -620,6 +627,8 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
terrainChangeQueue.clear() terrainChangeQueue.clear()
wallChangeQueue.clear() wallChangeQueue.clear()
wireChangeQueue.clear() wireChangeQueue.clear()
oldSelectedWireRenderClass = selectedWireRenderClass
} }
@@ -659,11 +668,6 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
// deal with the uiFixture being closed // deal with the uiFixture being closed
if (uiFixture?.isClosed == true) { uiFixture = null } if (uiFixture?.isClosed == true) { uiFixture = null }
// fill up visibleActorsRenderFront for wires
measureDebugTime("Ingame.FillUpWiresBuffer") {
fillUpWiresBuffer()
}
IngameRenderer.invoke( IngameRenderer.invoke(
paused, paused,
visibleActorsRenderBehind, visibleActorsRenderBehind,