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

saving performed on separate thread so that save-in-progress UI would work

Browse Source
This commit is contained in:
minjaesong
2021-09-14 14:28:38 +09:00
parent b084f9e5a9
commit ce19a85a93
6 changed files with 189 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,8 +378,10 @@ object IngameRenderer : Disposable {
processBlur(lightmapFboA, lightmapFboB)
}
internal var fboRGBexportRequested = false
internal var fboRGBexportCallback: (FrameBuffer) -> Unit = {}
@Volatile internal var fboRGBexportRequested = false
@Volatile internal var fboRGBexportedLatch = false
@Volatile internal var fboRGBexportCallback: (FrameBuffer) -> Unit = {}
@Volatile internal lateinit var fboRGBexport: Pixmap
private fun drawToRGB(
actorsRenderBehind: List<ActorWithBody>?,
@@ -737,6 +739,11 @@ object IngameRenderer : Disposable {
shaderRGBOnly.dispose()
shaderAtoGrey.dispose()
shaderPassthru.dispose()
try {
fboRGBexport.dispose()
}
catch (e: Throwable) { e.printStackTrace() }
}
private fun worldCamToRenderPos(): Pair<Float, Float> {

4
src/net/torvald/terrarum/modulebasegame/ui/UIProxyNewRandomGame.kt
View File

@@ -38,10 +38,10 @@ class UIProxyNewRandomGame : UICanvas() {
val ingame = TerrarumIngame(App.batch)
// val worldParam = TerrarumIngame.NewWorldParameters(2880, 1350, HQRNG().nextLong())
val worldParam = TerrarumIngame.NewWorldParameters(2880, 1350, HQRNG().nextLong())
// val worldParam = TerrarumIngame.NewWorldParameters(2880, 1350, 0x51621D)
val worldParam = TerrarumIngame.NewWorldParameters(6030, 1800, HQRNG().nextLong()) // small
// val worldParam = TerrarumIngame.NewWorldParameters(6030, 1800, HQRNG().nextLong()) // small
// val worldParam = TerrarumIngame.NewWorldParameters(9000, 2250, HQRNG().nextLong()) // normal
// val worldParam = TerrarumIngame.NewWorldParameters(13500, 2970, HQRNG().nextLong()) // large
// val worldParam = TerrarumIngame.NewWorldParameters(22500, 4500, HQRNG().nextLong()) // huge