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

some random shits

Browse Source
This commit is contained in:
minjaesong
2024-03-06 03:30:50 +09:00
parent dbff2610ac
commit 2340cb7419
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/gamecontroller/IngameController.kt
View File

@@ -287,7 +287,7 @@ class IngameController(val terrarumIngame: TerrarumIngame) : InputAdapter() {
it.actorValue.set(AVKey.__PLAYER_QUICKSLOTSEL, selection fmod UIQuickslotBar.SLOT_COUNT) it.actorValue.set(AVKey.__PLAYER_QUICKSLOTSEL, selection fmod UIQuickslotBar.SLOT_COUNT)
} }
} }
terrarumIngame.uiContainer.forEach { if (it?.justOpened == false) it?.scrolled(amountX, amountY) } terrarumIngame.uiContainer.forEach { if (it?.justOpened == false) it.scrolled(amountX, amountY) }
return true return true
} }

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

@@ -720,13 +720,13 @@ object LightmapRenderer {
val arrayY = y.convY() val arrayY = y.convY()
val (red, grn, blu, uvl) = lightmap.getVec(arrayX, arrayY) val (red, grn, blu, uvl) = lightmap.getVec(arrayX, arrayY)
// val redw = (red.sqrt() - 1f) * (7f / 24f) // val redw = (grn.sqrt() - 1f) * (1f / 53f)
// val grnw = (grn.sqrt() - 1f) // val grnw = (red.sqrt() - 1f) * (1f / 39f)
// val bluw = (blu.sqrt() - 1f) * (7f / 72f) // val bluw = (blu.sqrt() - 1f) * (1f / 159f)
// val bluwv = (blu.sqrt() - 1f) * (1f / 50f) // val bluwv = (blu.sqrt() - 1f) * (1f / 39f)
// val uvlwr = (uvl.sqrt() - 1f) * (1f / 13f) // val uvlwr = (uvl.sqrt() - 1f) * (1f / 947f)
// val uvlwg = (uvl.sqrt() - 1f) * (1f / 10f) // val uvlwg = (uvl.sqrt() - 1f) * (1f / 1279f)
// val uvlwb = (uvl.sqrt() - 1f) * (1f / 8f) // val uvlwb = (uvl.sqrt() - 1f) * (1f / 319f)
if (solidMultMagic == null) if (solidMultMagic == null)
lightBuffer.drawPixel( lightBuffer.drawPixel(
@@ -735,14 +735,14 @@ object LightmapRenderer {
0 0
) )
else else
/*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
(max(red,grnw,bluw,uvlwr) * solidMultMagic).tonemap().times(255f).roundToInt().shl(24) or (maxOf(red,grnw,bluw,uvlwr) * solidMultMagic).tonemap().times(255f).roundToInt().shl(24) or
(max(redw,grn,bluw,uvlwg) * solidMultMagic).tonemap().times(255f).roundToInt().shl(16) or (maxOf(redw,grn,bluw,uvlwg) * solidMultMagic).tonemap().times(255f).roundToInt().shl(16) or
(max(redw,grnw,blu,uvlwb) * solidMultMagic).tonemap().times(255f).roundToInt().shl(8) or (maxOf(redw,grnw,blu,uvlwb) * solidMultMagic).tonemap().times(255f).roundToInt().shl(8) or
(max(bluwv,uvl) * solidMultMagic).tonemap().times(255f).roundToInt() (maxOf(bluwv,uvl) * solidMultMagic).tonemap().times(255f).roundToInt()
)*/ )*/
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