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

fix: clouds not using their alpha value to draw

Browse Source
This commit is contained in:
minjaesong
2023-09-19 01:45:59 +09:00
parent 5616b81a31
commit 5069e90aa1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/torvald/terrarum/weather/WeatherObjectCloud.kt
View File

@@ -47,7 +47,7 @@ class WeatherObjectCloud(
scl(world.worldTime.timeDelta.toFloat()) scl(world.worldTime.timeDelta.toFloat())
) )
eigenAlpha = if (posZ < 1f) posZ.pow(0.5f) else cosh((posZ - CLOUD_STAGE_DEPTH) / (0.75636f * CLOUD_STAGE_DEPTH)) - 1f //-((posZ - 1f) / CLOUD_STAGE_DEPTH) + 1f eigenAlpha = if (posZ >= CLOUD_STAGE_DEPTH) 0f else if (posZ < 1f) posZ.pow(0.5f) else cosh((posZ - CLOUD_STAGE_DEPTH) / (0.75636f * CLOUD_STAGE_DEPTH)) - 1f //-((posZ - 1f) / CLOUD_STAGE_DEPTH) + 1f
val alphaMult = if (life < NEWBORN_GROWTH_TIME) val alphaMult = if (life < NEWBORN_GROWTH_TIME)
life / NEWBORN_GROWTH_TIME life / NEWBORN_GROWTH_TIME
@@ -78,12 +78,15 @@ class WeatherObjectCloud(
private val vecMult = Vector3(1f, 1f, 1f / (4f * H)) private val vecMult = Vector3(1f, 1f, 1f / (4f * H))
fun render(batch: UnpackedColourSpriteBatch, cloudDrawColour: Color) { fun render(batch: UnpackedColourSpriteBatch, cloudDrawColour0: Color) {
val sc = screenCoord val sc = screenCoord
// printdbg(this, "gamma: (${rgbGamma}, ${aGamma}) index: ($rgbGammaIndex, $aGammaIndex)") // printdbg(this, "gamma: (${rgbGamma}, ${aGamma}) index: ($rgbGammaIndex, $aGammaIndex)")
batch.color = cloudDrawColour val cloudCol = cloudDrawColour0.cpy().also {
it.a = alpha
}
batch.color = cloudCol
batch.generic.set(rgbGamma, aGamma, 0f, 0f) batch.generic.set(rgbGamma, aGamma, 0f, 0f)
if (flipW) if (flipW)