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

cloud model update

Browse Source
This commit is contained in:
minjaesong
2023-10-03 04:37:39 +09:00
parent cd2043b044
commit 48a07a9be5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,7 +562,7 @@ internal object WeatherMixer : RNGConsumer {
batch.color = Color.WHITE batch.color = Color.WHITE
} }
private val RECIPROCAL_OF_APPARENT_SOLAR_Y_AT_45DEG = 0.00000785 private val RECIPROCAL_OF_APPARENT_SOLAR_Y_AT_45DEG = 0.000007
private val APPARENT_SOLAR_Y_AT_45DEG = 1.0 / RECIPROCAL_OF_APPARENT_SOLAR_Y_AT_45DEG private val APPARENT_SOLAR_Y_AT_45DEG = 1.0 / RECIPROCAL_OF_APPARENT_SOLAR_Y_AT_45DEG
/** /**
@@ -592,7 +592,7 @@ internal object WeatherMixer : RNGConsumer {
clouds.forEach { clouds.forEach {
val altOfSolarRay = cloudYtoSolarAlt(it.posY*-1.0, solarElev) val altOfSolarRay = cloudYtoSolarAlt(it.posY*-1.0, solarElev)
val cloudCol1 = getGradientCloud(skyboxavr, solarElev, 1.0, turbidity, albedo) val cloudCol1 = getGradientCloud(skyboxavr, altOfSolarRay, mornNoonBlend.toDouble(), turbidity, albedo)
val cloudCol2 = getGradientColour2(currentWeather.daylightClut, altOfSolarRay, timeNow, 4) val cloudCol2 = getGradientColour2(currentWeather.daylightClut, altOfSolarRay, timeNow, 4)
val cloudDrawColour = lerp(0.7, cloudCol1, cloudCol2) // no srgblerp for performance val cloudDrawColour = lerp(0.7, cloudCol1, cloudCol2) // no srgblerp for performance
@@ -607,7 +607,7 @@ internal object WeatherMixer : RNGConsumer {
private val parallaxDomainSize = 550f private val parallaxDomainSize = 550f
private val turbidityDomainSize = parallaxDomainSize * 1.3333334f private val turbidityDomainSize = parallaxDomainSize * 1.3333334f
private val CLOUD_SOLARDEG_OFFSET = -0.0f private val CLOUD_SOLARDEG_OFFSET = 0.3f
private val globalLightBySun = Cvec() private val globalLightBySun = Cvec()
private val globalLightByMoon = Cvec() private val globalLightByMoon = Cvec()
@@ -889,7 +889,7 @@ internal object WeatherMixer : RNGConsumer {
val A = lerp(bx, b1A, b2A) val A = lerp(bx, b1A, b2A)
val B = lerp(bx, b1B, b2B) val B = lerp(bx, b1B, b2B)
return B//lerp(mornNoonBlend, A, B) return lerp(mornNoonBlend, A, B)
} }
private fun lerp(x: Double, c1: Cvec, c2: Cvec): Cvec { private fun lerp(x: Double, c1: Cvec, c2: Cvec): Cvec {

2
src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
View File

@@ -370,7 +370,7 @@ internal object BlocksDrawer {
// hide tiles with super low lights, kinda like Minecraft's Orebfuscator // hide tiles with super low lights, kinda like Minecraft's Orebfuscator
val lightAtXY = LightmapRenderer.getLight(x, y) ?: Cvec(0) val lightAtXY = LightmapRenderer.getLight(x, y) ?: Cvec(0)
if (lightAtXY.fastLum() <= 2f / 255f) { if (lightAtXY.fastLum() <= 4f / 255f) {
tileNumber = 2 // black solid tileNumber = 2 // black solid
} }