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

light: skipping some of the update round wasn't a good idea

Browse Source
This commit is contained in:
minjaesong
2019-02-07 18:04:34 +09:00
parent 833f1a83e6
commit 1c874f92c2
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/LoadScreen.kt
View File

@@ -31,7 +31,7 @@ object LoadScreen : ScreenAdapter() {
private var arrowObjPos = 0f // 0 means at starting position, regardless of screen position private var arrowObjPos = 0f // 0 means at starting position, regardless of screen position
private var arrowObjGlideOffsetX = 0f private var arrowObjGlideOffsetX = 0f
private var arrowObjGlideSize = 0f private var arrowObjGlideSize = 0f
private val arrowGlideSpeed: Float; get() = Terrarum.WIDTH * 1.5f // pixels per sec private val arrowGlideSpeed: Float; get() = Terrarum.WIDTH / 2f // pixels per sec
private lateinit var arrowObjTex: Texture private lateinit var arrowObjTex: Texture
private var glideTimer = 0f private var glideTimer = 0f
private var glideDispY = 0f private var glideDispY = 0f
@@ -120,6 +120,8 @@ object LoadScreen : ScreenAdapter() {
private var messageForegroundColour = Color.WHITE private var messageForegroundColour = Color.WHITE
override fun render(delta: Float) { override fun render(delta: Float) {
val delta = Gdx.graphics.deltaTime
glideDispY = Terrarum.HEIGHT - 100f - Terrarum.fontGame.lineHeight glideDispY = Terrarum.HEIGHT - 100f - Terrarum.fontGame.lineHeight
arrowObjGlideSize = arrowObjTex.width + 2f * Terrarum.WIDTH arrowObjGlideSize = arrowObjTex.width + 2f * Terrarum.WIDTH

27
src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt
View File

@@ -270,9 +270,8 @@ object LightmapRenderer {
* | | 3| |↗ | | ↖| |3 | | * | | 3| |↗ | | ↖| |3 | |
* `--+-----' `--------' `--------' `-----+--' * `--+-----' `--------' `--------' `-----+--'
* round: 1 2 3 4 * round: 1 2 3 4
* for all lightmap[y][x], run in this order: 2-3-4-1-2 * for all lightmap[y][x], run in this order: 2-3-4-1
* If you run only 4 sets, orthogonal/diagonal artefacts are bound to occur, * If you run only 4 sets, orthogonal/diagonal artefacts are bound to occur,
* it seems 5-pass is mandatory
*/ */
// set sunlight // set sunlight
@@ -301,11 +300,6 @@ object LightmapRenderer {
// The skipping is dependent on how you get ambient light, // The skipping is dependent on how you get ambient light,
// in this case we have 'spillage' due to the fact calculate() samples 3x3 area. // in this case we have 'spillage' due to the fact calculate() samples 3x3 area.
// FIXME theoretically skipping shouldn't work (light can be anywhere on the screen, not just centre
// but how does it actually work ?!?!?!!?!?!?!?
// because things are filled in subsequent frames ?
// because of not wiping out prev map ! (if pass=1 also calculates ambience, was disabled to not have to wipe out)
AppLoader.measureDebugTime("Renderer.LightTotal") { AppLoader.measureDebugTime("Renderer.LightTotal") {
// Round 2 // Round 2
for (y in for_y_end + overscan_open downTo for_y_start) { for (y in for_y_end + overscan_open downTo for_y_start) {
@@ -314,11 +308,11 @@ object LightmapRenderer {
} }
} }
// Round 3 // Round 3
/*for (y in for_y_end + overscan_open downTo for_y_start) { for (y in for_y_end + overscan_open downTo for_y_start) {
for (x in for_x_end + overscan_open downTo for_x_start) { for (x in for_x_end + overscan_open downTo for_x_start) {
calculateAndAssign(lightmap, x, y) calculateAndAssign(lightmap, x, y)
} }
}*/ }
// Round 4 // Round 4
for (y in for_y_start - overscan_open..for_y_end) { for (y in for_y_start - overscan_open..for_y_end) {
for (x in for_x_end + overscan_open downTo for_x_start) { for (x in for_x_end + overscan_open downTo for_x_start) {
@@ -326,17 +320,17 @@ object LightmapRenderer {
} }
} }
// Round 1 // Round 1
/*for (y in for_y_start - overscan_open..for_y_end) { for (y in for_y_start - overscan_open..for_y_end) {
for (x in for_x_start - overscan_open..for_x_end) {
calculateAndAssign(lightmap, x, y)
}
}*/
// Round 2 again
for (y in for_y_end + overscan_open downTo for_y_start) {
for (x in for_x_start - overscan_open..for_x_end) { for (x in for_x_start - overscan_open..for_x_end) {
calculateAndAssign(lightmap, x, y) calculateAndAssign(lightmap, x, y)
} }
} }
// Round 2 again
/*for (y in for_y_end + overscan_open downTo for_y_start) {
for (x in for_x_start - overscan_open..for_x_end) {
calculateAndAssign(lightmap, x, y)
}
}*/
} }
} }
else if (world.worldIndex != -1) { // to avoid updating on the null world else if (world.worldIndex != -1) { // to avoid updating on the null world
@@ -569,6 +563,7 @@ object LightmapRenderer {
private val inNoopMaskp = Point2i(0,0) private val inNoopMaskp = Point2i(0,0)
private fun inNoopMask(x: Int, y: Int): Boolean { private fun inNoopMask(x: Int, y: Int): Boolean {
// TODO: digitise your note of the idea of No-op Mask (date unknown, prob before 2017-03-17) // TODO: digitise your note of the idea of No-op Mask (date unknown, prob before 2017-03-17)
if (x in for_x_start..for_x_end) { if (x in for_x_start..for_x_end) {
// if it's in the top flange // if it's in the top flange