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

fixed a bug where zooming the world would read out-of-bound memory

Browse Source
This commit is contained in:
minjaesong
2021-12-09 11:23:39 +09:00
parent 93c67345cc
commit 5458e58a0e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ object LightmapRenderer {
const val overscan_open: Int = 40 const val overscan_open: Int = 40
const val overscan_opaque: Int = 10 const val overscan_opaque: Int = 10
const val LIGHTMAP_OVERRENDER = 40 const val LIGHTMAP_OVERRENDER = 20
private var LIGHTMAP_WIDTH: Int = (Terrarum.ingame?.ZOOM_MINIMUM ?: 1f).inv().times(App.scr.width).div(TILE_SIZE).ceilInt() + overscan_open * 2 + 3 private var LIGHTMAP_WIDTH: Int = (Terrarum.ingame?.ZOOM_MINIMUM ?: 1f).inv().times(App.scr.width).div(TILE_SIZE).ceilInt() + overscan_open * 2 + 3
private var LIGHTMAP_HEIGHT: Int = (Terrarum.ingame?.ZOOM_MINIMUM ?: 1f).inv().times(App.scr.height).div(TILE_SIZE).ceilInt() + overscan_open * 2 + 3 private var LIGHTMAP_HEIGHT: Int = (Terrarum.ingame?.ZOOM_MINIMUM ?: 1f).inv().times(App.scr.height).div(TILE_SIZE).ceilInt() + overscan_open * 2 + 3
@@ -169,8 +169,8 @@ object LightmapRenderer {
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 + LIGHTMAP_OVERRENDER for_draw_x_end = for_draw_x_start + WorldCamera.width / TILE_SIZE + 3 + 2*LIGHTMAP_OVERRENDER
for_draw_y_end = for_draw_y_start + WorldCamera.height / TILE_SIZE + 3 + LIGHTMAP_OVERRENDER for_draw_y_end = for_draw_y_start + WorldCamera.height / TILE_SIZE + 3 + 2*LIGHTMAP_OVERRENDER
camX = WorldCamera.x / TILE_SIZE camX = WorldCamera.x / TILE_SIZE
camY = WorldCamera.y / TILE_SIZE camY = WorldCamera.y / TILE_SIZE
@@ -611,7 +611,7 @@ object LightmapRenderer {
for (x in this_x_start..this_x_end) { for (x in this_x_start..this_x_end) {
val solidMultMagic = isSolid(x, y) val solidMultMagic = isSolid(x, y) // one of {1.2f, 1f, null}
val arrayX = x.convX() val arrayX = x.convX()
val arrayY = y.convY() val arrayY = y.convY()
@@ -628,7 +628,7 @@ object LightmapRenderer {
val uvlwg = (uvl.sqrt() - 1f) * (1f / 10f) val uvlwg = (uvl.sqrt() - 1f) * (1f / 10f)
val uvlwb = (uvl.sqrt() - 1f) * (1f / 8f) val uvlwb = (uvl.sqrt() - 1f) * (1f / 8f)
val color = if (solidMultMagic == null) if (solidMultMagic == null)
lightBuffer.drawPixel( lightBuffer.drawPixel(
x - this_x_start, x - this_x_start,
lightBuffer.height - 1 - y + this_y_start, // flip Y lightBuffer.height - 1 - y + this_y_start, // flip Y