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

y u no work :(

Browse Source
This commit is contained in:
minjaesong
2020-11-10 11:54:52 +09:00
parent a7ef6b1f53
commit b7f7589990
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ object LightmapRenderer {
*/ */
for (i in 0 until LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 5) { for (i in 0 until LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 5) {
swipeLight( swipeLight(
maxOf(1, i - LIGHTMAP_HEIGHT - 2 + 2), maxOf(1, LIGHTMAP_HEIGHT - 2 - i), maxOf(1, i - LIGHTMAP_HEIGHT + 4), maxOf(1, LIGHTMAP_HEIGHT - 2 - i),
minOf(LIGHTMAP_WIDTH - 2, i + 1), minOf(LIGHTMAP_HEIGHT - 2, (LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 5) - i), minOf(LIGHTMAP_WIDTH - 2, i + 1), minOf(LIGHTMAP_HEIGHT - 2, (LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 5) - i),
1, 1 1, 1
) )
@@ -349,8 +349,8 @@ object LightmapRenderer {
*/ */
for (i in 0 until LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 5) { for (i in 0 until LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 5) {
swipeLight( swipeLight(
maxOf(1, i - 3), minOf(LIGHTMAP_HEIGHT - 2, i + 1), maxOf(1, i - LIGHTMAP_HEIGHT + 4), minOf(LIGHTMAP_HEIGHT - 2, i + 1),
minOf(LIGHTMAP_WIDTH - 2, i + 1), maxOf(1, (LIGHTMAP_HEIGHT - 2) + i - (LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 6)), minOf(LIGHTMAP_WIDTH - 2, i + 1), maxOf(1, (LIGHTMAP_HEIGHT - 2) - (LIGHTMAP_WIDTH + LIGHTMAP_HEIGHT - 6) + i),
1, -1 1, -1
) )
} }
@@ -650,7 +650,6 @@ object LightmapRenderer {
lightmap.setVec(x, y, _ambientAccumulator) lightmap.setVec(x, y, _ambientAccumulator)
} }
private fun swipeLight(sx: Int, sy: Int, ex: Int, ey: Int, dx: Int, dy: Int) { private fun swipeLight(sx: Int, sy: Int, ex: Int, ey: Int, dx: Int, dy: Int) {
swipeX = sx; swipeY = sy swipeX = sx; swipeY = sy
while (swipeX <= ex && swipeY <= ey) { while (swipeX <= ex && swipeY <= ey) {
// conduct the task #1 // conduct the task #1