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

lightmap to update every other frame, and rendering needs fix minor jitter

Browse Source
This commit is contained in:
minjaesong
2021-08-14 12:52:47 +09:00
parent 479dc5c3fb
commit 168e4f08b5
7 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/torvald/terrarum/AppLoader.java
View File

@@ -38,6 +38,7 @@ import net.torvald.terrarum.worlddrawer.CreateTileAtlas;
import net.torvald.terrarumsansbitmap.gdx.GameFontBase;
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack;
import net.torvald.util.ArrayListMap;
import net.torvald.util.DebugTimers;
import org.lwjgl.opengl.GL11;
import java.io.File;
@@ -205,7 +206,7 @@ public class AppLoader implements ApplicationListener {
public static int GLOBAL_RENDER_TIMER = new Random().nextInt(1020) + 1;
public static ArrayListMap debugTimers = new ArrayListMap<String, Long>();
public static DebugTimers debugTimers = new DebugTimers();
public static final String FONT_DIR = "assets/graphics/fonts/terrarum-sans-bitmap";

2
src/net/torvald/terrarum/gameworld/WorldSimulator.kt
View File

@@ -500,7 +500,7 @@ object WorldSimulator {
// this makes sure that only the emitters with wires installed will get traversed
world.getWireGraphOf(point.x, point.y, wire)?.let { _ ->
printdbg(this, wire)
val points = Queue<WireGraphCursor>() // a queue, enqueued at the end
var marked = HashSet<Long>()

18
src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
View File

@@ -11,7 +11,9 @@ import com.badlogic.gdx.utils.Disposable
import com.badlogic.gdx.utils.ScreenUtils
import net.torvald.gdx.graphics.PixmapIO2
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.TerrarumAppConfiguration.TILE_SIZEF
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gamecontroller.KeyToggler
@@ -170,6 +172,8 @@ object IngameRenderer : Disposable {
}
}
private var oldCamX = 0
operator fun invoke(
gamePaused: Boolean,
actorsRenderBehind : List<ActorWithBody>? = null,
@@ -200,7 +204,13 @@ object IngameRenderer : Disposable {
if (!gamePaused) {
LightmapRenderer.fireRecalculateEvent(actorsRenderBehind, actorsRenderFront, actorsRenderMidTop, actorsRenderMiddle, actorsRenderOverlay)
measureDebugTime("Renderer.ApparentLightRun") {
// recalculate for even frames, or if the sign of the cam-x changed
if (AppLoader.GLOBAL_RENDER_TIMER % 2 == 0 || WorldCamera.x * oldCamX < 0)
LightmapRenderer.fireRecalculateEvent(actorsRenderBehind, actorsRenderFront, actorsRenderMidTop, actorsRenderMiddle, actorsRenderOverlay)
oldCamX = WorldCamera.x
}
prepLightmapRGBA()
BlocksDrawer.renderData()
@@ -737,8 +747,10 @@ object IngameRenderer : Disposable {
private fun worldCamToRenderPos(): Pair<Float, Float> {
// for some reason it does not like integer. No, really; it breaks (jitter when you move) when you try to "fix" that.
val xrem = -(WorldCamera.x.toFloat() fmod TILE_SIZEF)
val yrem = -(WorldCamera.y.toFloat() fmod TILE_SIZEF)
val xoff = (WorldCamera.x / TILE_SIZE) - LightmapRenderer.camX
val yoff = (WorldCamera.y / TILE_SIZE) - LightmapRenderer.camY
val xrem = -(WorldCamera.x.toFloat() fmod TILE_SIZEF) - (xoff * TILE_SIZEF)
val yrem = -(WorldCamera.y.toFloat() fmod TILE_SIZEF) - (yoff * TILE_SIZEF)
return xrem to yrem
}

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

@@ -38,6 +38,7 @@ import net.torvald.terrarum.modulebasegame.worldgenerator.WorldgenParams
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.worlddrawer.BlocksDrawer
import net.torvald.terrarum.worlddrawer.FeaturesDrawer
import net.torvald.terrarum.worlddrawer.LightmapRenderer
import net.torvald.terrarum.worlddrawer.WorldCamera
import net.torvald.util.CircularArray
import net.torvald.util.SortedArrayList
@@ -630,7 +631,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
// TODO thread pool(?)
CollisionSolver.process()
WorldCamera.update(gameworld, actorNowPlaying)
//WorldCamera.update(gameworld, actorNowPlaying)
}
@@ -665,6 +666,8 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
private fun renderGame() {
Gdx.graphics.setTitle(getCanonicalTitle())
WorldCamera.update(gameworld, actorNowPlaying)
measureDebugTime("Ingame.FilterVisibleActors") {
filterVisibleActors()
}

3
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -235,6 +235,9 @@ class BasicDebugInfoWindow : UICanvas() {
// FPS count
AppLoader.fontSmallNumbers.draw(batch, "${ccY}FPS${ccG}${Gdx.graphics.framesPerSecond.toString().padStart(3, ' ')}",
(AppLoader.screenSize.screenW - 3 - 15 * TinyAlphNum.W).toFloat(), line(2))
// global render counter
AppLoader.fontSmallNumbers.draw(batch, "${ccO}${AppLoader.GLOBAL_RENDER_TIMER.toString().padStart(10, ' ')}",
(AppLoader.screenSize.screenW - 35 * TinyAlphNum.W - 2).toFloat(), line(1))
/**
* Bottom left

9
src/net/torvald/terrarum/worlddrawer/LightmapRenderer.kt
View File

@@ -60,7 +60,7 @@ object LightmapRenderer {
finally {
this.world = world
// fireRecalculateEvent()
//fireRecalculateEvent()
}
}
@@ -101,6 +101,8 @@ object LightmapRenderer {
internal var for_draw_y_start = 0
internal var for_draw_x_end = 0
internal var for_draw_y_end = 0
internal var camX = 0
internal var camY = 0
/**
* @param x world coord
@@ -137,7 +139,7 @@ object LightmapRenderer {
}
}
internal fun fireRecalculateEvent(vararg actorContainers: List<ActorWithBody>?) {
fun fireRecalculateEvent(vararg actorContainers: List<ActorWithBody>?) {
try {
world.getTileFromTerrain(0, 0) // test inquiry
}
@@ -167,6 +169,9 @@ object LightmapRenderer {
for_draw_x_end = for_draw_x_start + WorldCamera.width / TILE_SIZE + 3
for_draw_y_end = for_draw_y_start + WorldCamera.height / TILE_SIZE + 3
camX = WorldCamera.x / TILE_SIZE
camY = WorldCamera.y / TILE_SIZE
//println("$for_x_start..$for_x_end, $for_x\t$for_y_start..$for_y_end, $for_y")
AppLoader.measureDebugTime("Renderer.Lanterns") {

37
src/net/torvald/util/DebugTimers.kt Normal file
View File

@@ -0,0 +1,37 @@
package net.torvald.util
/**
* Debugtimers will collect multiple measurements and will return stabilised time reading
*
* Created by minjaesong on 2021-08-14
*/
class DebugTimers {
private val BUFFER_SIZE = 16
private val bufs = ArrayListMap<String, CircularArray<Long>>()
fun put(key: String, value: Long) {
if (bufs[key] == null) bufs[key] = CircularArray(BUFFER_SIZE, true)
bufs[key]!!.appendHead(value)
}
operator fun get(key: String): Long? {
if (bufs[key] == null) return null
else {
var s = 0L; var c = 0
for (i in 0 until BUFFER_SIZE) {
bufs[key]!![i]?.let {
s += it
c += 1
}
}
return if (c == 0) 0L else s / c
}
}
fun forEach(action: (String, Long?) -> Unit) {
bufs.keys.forEach { key -> action(key, get(key)) }
}
}