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

f

Browse Source
This commit is contained in:
minjaesong
2019-01-18 03:14:37 +09:00
parent a379c7dea8
commit ff0dade5c8
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,13 +148,6 @@ object LightmapRenderer {
return null return null
} }
// TODO in regard of "colour math against integers", take Int
/**
* Simply stores the given colour into the main lightmap.
*/
private fun setLight(x: Int, y: Int, colour: Color) {
setLightOf(lightmap, x, y, colour)
}
/** /**
* Converts world coord (x,y) into the lightmap index, and stores the input colour into the given list * Converts world coord (x,y) into the lightmap index, and stores the input colour into the given list
@@ -175,7 +168,7 @@ object LightmapRenderer {
val ypos = y - for_y_start + overscan_open val ypos = y - for_y_start + overscan_open
val xpos = x - for_x_start + overscan_open val xpos = x - for_x_start + overscan_open
//lightmap[ypos][xpos] = colour //lightmap[ypos][xpos] = applyFun.invoke(list[ypos][xpos], colour)
list[ypos * LIGHTMAP_WIDTH + xpos] = applyFun.invoke(list[ypos * LIGHTMAP_WIDTH + xpos], colour) list[ypos * LIGHTMAP_WIDTH + xpos] = applyFun.invoke(list[ypos * LIGHTMAP_WIDTH + xpos], colour)
} }
} }
@@ -227,11 +220,11 @@ object LightmapRenderer {
// wipe out lightmap // wipe out lightmap
AppLoader.debugTimers["Renderer.Light0"] = measureNanoTime { AppLoader.debugTimers["Renderer.Light0"] = measureNanoTime {
//for (ky in 0 until lightmap.size) for (kx in 0 until lightmap[0].size) lightmap[ky][kx] = colourNull
for (k in 0 until lightmap.size) lightmap[k] = colourNull for (k in 0 until lightmap.size) lightmap[k] = colourNull
// when disabled, light will "decay out" instead of "instantly out", which can have a cool effect // when disabled, light will "decay out" instead of "instantly out", which can have a cool effect
// but the performance boost is measly 0.1 ms on 6700K // but the performance boost is measly 0.1 ms on 6700K
} }
// O((5*9)n) == O(n) where n is a size of the map. // O((5*9)n) == O(n) where n is a size of the map.
// Because of inevitable overlaps on the area, it only works with MAX blend // Because of inevitable overlaps on the area, it only works with MAX blend