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

lightmap fix fox edge case when CameraX < 0

Browse Source
This commit is contained in:
minjaesong
2019-08-13 14:47:23 +09:00
parent f62f751243
commit 9b470bb3bb
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
View File

@@ -21,7 +21,7 @@ class UIScreenZoom : UICanvas(
override var width = AppLoader.fontGame.getWidth(zoomText) override var width = AppLoader.fontGame.getWidth(zoomText)
override var height = AppLoader.fontGame.lineHeight.toInt() override var height = AppLoader.fontGame.lineHeight.toInt()
override var openCloseTime = 0.2f override var openCloseTime = 0.15f
override val mouseUp = false override val mouseUp = false

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

@@ -123,8 +123,6 @@ object LightmapRenderer {
internal var for_draw_y_start = 0 internal var for_draw_y_start = 0
internal var for_draw_x_end = 0 internal var for_draw_x_end = 0
internal var for_draw_y_end = 0 internal var for_draw_y_end = 0
//internal var for_x = 0
//internal var for_y = 0
/** /**
* @param x world coord * @param x world coord
@@ -183,19 +181,14 @@ object LightmapRenderer {
for_draw_x_start = WorldCamera.x / TILE_SIZE for_draw_x_start = WorldCamera.x / TILE_SIZE
for_draw_y_start = WorldCamera.y / TILE_SIZE for_draw_y_start = WorldCamera.y / TILE_SIZE
if (for_x_start < 0) for_x_start -= 1 // to fix that the light shifts 1 tile to the left when WorldCamera < 0 if (WorldCamera.x < 0) for_draw_x_start -= 1 // edge case fix that light shift 1 tile to the left when WorldCamera.x < 0
//if (for_y_start < 0) for_y_start -= 1 // not needed when we only wrap at x axis //if (WorldCamera.x in -(TILE_SIZE - 1)..-1) for_draw_x_start -= 1 // another edge-case fix; we don't need this anymore?
if (WorldCamera.x in -(TILE_SIZE - 1)..-1) for_x_start -= 1 // another edge-case fix
for_x_end = for_x_start + WorldCamera.zoomedWidth / TILE_SIZE + 3 for_x_end = for_x_start + WorldCamera.zoomedWidth / TILE_SIZE + 3
for_y_end = for_y_start + WorldCamera.zoomedHeight / TILE_SIZE + 3 // same fix as above for_y_end = for_y_start + WorldCamera.zoomedHeight / TILE_SIZE + 3 // same fix as above
for_draw_x_end = for_draw_x_start + WorldCamera.width / TILE_SIZE + 3 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 for_draw_y_end = for_draw_y_start + WorldCamera.height / TILE_SIZE + 3
//for_x = for_x_start + (for_x_end - for_x_start) / 2
//for_y = for_y_start + (for_y_end - for_y_start) / 2
//println("$for_x_start..$for_x_end, $for_x\t$for_y_start..$for_y_end, $for_y") //println("$for_x_start..$for_x_end, $for_x\t$for_y_start..$for_y_end, $for_y")
AppLoader.measureDebugTime("Renderer.Lanterns") { AppLoader.measureDebugTime("Renderer.Lanterns") {