From 930c55c297feb539f33a2dcd94015cacc1fa7fbb Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 25 Sep 2023 21:52:01 +0900 Subject: [PATCH] changed colourmap again but I need to re-work the hosek model --- assets/mods/basegame/weathers/clut_daylight.kra | 4 ++-- assets/mods/basegame/weathers/clut_daylight.tga | 4 ++-- src/net/torvald/terrarum/weather/WeatherMixer.kt | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/mods/basegame/weathers/clut_daylight.kra b/assets/mods/basegame/weathers/clut_daylight.kra index 7329d849b..12ebd1851 100644 --- a/assets/mods/basegame/weathers/clut_daylight.kra +++ b/assets/mods/basegame/weathers/clut_daylight.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa611c76eb244c54dba898234a34cc85e482639b714f8044c57fac49f4b7be32 -size 88068 +oid sha256:06703574c58523bea910f3c1d98a77940997666670ff8e017641538e26f9959a +size 97812 diff --git a/assets/mods/basegame/weathers/clut_daylight.tga b/assets/mods/basegame/weathers/clut_daylight.tga index 222403a4b..3eb520fcf 100644 --- a/assets/mods/basegame/weathers/clut_daylight.tga +++ b/assets/mods/basegame/weathers/clut_daylight.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2085a2519ccbf653275a7cec2e4d9fb71167df2042e6a5e96a2cb51dea92fca -size 2418 +oid sha256:16323d626a2fb566817e0dfab989c3772c31677af959d8fdcba821a1bc6f3577 +size 3618 diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index 6556ae31f..ab2c7841c 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -592,7 +592,7 @@ internal object WeatherMixer : RNGConsumer { val altOfSolarRay = cloudYtoSolarAlt(it.posY*-1.0, solarElev) val cloudCol1 = getGradientCloud(skyboxavr, solarElev, mornNoonBlend.toDouble(), turbidity, albedo) - val cloudCol2 = getGradientColour2(currentWeather.daylightClut, altOfSolarRay, timeNow) + val cloudCol2 = getGradientColour2(currentWeather.daylightClut, altOfSolarRay, timeNow, 4) val cloudDrawColour = lerp(0.75, cloudCol1, cloudCol2) // no srgblerp for performance val shadiness = (1.0 / cosh(altOfSolarRay * 0.5)).toFloat().coerceAtLeast(if (altOfSolarRay < 0) 0.6666f else 0f) @@ -773,7 +773,7 @@ internal object WeatherMixer : RNGConsumer { return Cvec(newCol) } - fun getGradientColour2(colorMap: GdxColorMap, solarAngleInDeg: Double, timeOfDay: Int): Cvec { + fun getGradientColour2(colorMap: GdxColorMap, solarAngleInDeg: Double, timeOfDay: Int, offY: Int = 0): Cvec { val pNowRaw = (solarAngleInDeg + 75.0) / 150.0 * colorMap.width val pStartRaw = pNowRaw.floorToInt() @@ -807,8 +807,8 @@ internal object WeatherMixer : RNGConsumer { var scale = (pNowRaw - pStartRaw).toFloat() if (timeOfDay >= HALF_DAY) scale = 1f - scale - val colourThisRGB = colorMap.get(pSx, pSy) - val colourNextRGB = colorMap.get(pNx, pNy) + val colourThisRGB = colorMap.get(pSx, pSy + offY) + val colourNextRGB = colorMap.get(pNx, pNy + offY) val colourThisUV = colorMap.get(pSx, pSy + 2) val colourNextUV = colorMap.get(pNx, pNy + 2)