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

changed colourmap again but I need to re-work the hosek model

Browse Source
This commit is contained in:
minjaesong
2023-09-25 21:52:01 +09:00
parent 0a4811ca02
commit 930c55c297
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/mods/basegame/weathers/clut_daylight.kra LFS
View File

Binary file not shown.

BIN
assets/mods/basegame/weathers/clut_daylight.tga LFS
View File

Binary file not shown.

8
src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -592,7 +592,7 @@ internal object WeatherMixer : RNGConsumer {
val altOfSolarRay = cloudYtoSolarAlt(it.posY*-1.0, solarElev) val altOfSolarRay = cloudYtoSolarAlt(it.posY*-1.0, solarElev)
val cloudCol1 = getGradientCloud(skyboxavr, solarElev, mornNoonBlend.toDouble(), turbidity, albedo) 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 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) 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) 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 pNowRaw = (solarAngleInDeg + 75.0) / 150.0 * colorMap.width
val pStartRaw = pNowRaw.floorToInt() val pStartRaw = pNowRaw.floorToInt()
@@ -807,8 +807,8 @@ internal object WeatherMixer : RNGConsumer {
var scale = (pNowRaw - pStartRaw).toFloat() var scale = (pNowRaw - pStartRaw).toFloat()
if (timeOfDay >= HALF_DAY) scale = 1f - scale if (timeOfDay >= HALF_DAY) scale = 1f - scale
val colourThisRGB = colorMap.get(pSx, pSy) val colourThisRGB = colorMap.get(pSx, pSy + offY)
val colourNextRGB = colorMap.get(pNx, pNy) val colourNextRGB = colorMap.get(pNx, pNy + offY)
val colourThisUV = colorMap.get(pSx, pSy + 2) val colourThisUV = colorMap.get(pSx, pSy + 2)
val colourNextUV = colorMap.get(pNx, pNy + 2) val colourNextUV = colorMap.get(pNx, pNy + 2)