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

actual maths solution for the smoothLinear

Browse Source
This commit is contained in:
minjaesong
2023-07-30 22:52:00 +09:00
parent f4bfe84009
commit 1669f7fdd0
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/net/torvald/terrarum/modulebasegame/clut/Skybox.kt
View File

@@ -127,22 +127,23 @@ object Skybox : Disposable {
val x = this.coerceIn(low, high) val x = this.coerceIn(low, high)
val x2 = ((x - low) * (high - low).pow(-1.0)) val x2 = ((x - low) * (high - low).pow(-1.0))
// return FastMath.interpolateLinear(polynomialDecay2(0.5, 2, x2), low, high) // return FastMath.interpolateLinear(polynomialDecay2(0.5, 2, x2), low, high)
return FastMath.interpolateLinear(smoothLinear(x2), low, high) return FastMath.interpolateLinear(smoothLinear(0.2, x2), low, high)
} }
/** /**
* To get the idea what the fuck is going on here, please refer to https://www.desmos.com/calculator/d2otu5deub * To get the idea what the fuck is going on here, please refer to https://www.desmos.com/calculator/snqglcu2wl
*/ */
private fun smoothLinear(x: Double): Double { private fun smoothLinear(p: Double, x0: Double): Double {
val k = 0.11269 // a magic number val x = x0 - 0.5
val d = 1.127016653 // also a magic number val t = 0.5 * sqrt(1.0 - 2.0 * p)
val a = -1.0 / 0.2 val y0 = if (x < -t)
return if (x < k) (1.0 / p) * (x + 0.5).pow(2) - 0.5
-a.pow(1) * x.pow(2) else if (x > t)
else if (x > 1.0 - k) -(1.0 / p) * (x - 0.5).pow(2) + 0.5
a.pow(1) * (1.0 - x).pow(2) + 1.0
else else
d * (x - 0.5) + 0.5 x * 2.0 / (1.0 + sqrt(1.0 - 2.0 * p))
return y0 + 0.5
} }
private fun getTexturmaps(albedo: Double): Array<Texture> { private fun getTexturmaps(albedo: Double): Array<Texture> {

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

@@ -153,6 +153,7 @@ internal object WeatherMixer : RNGConsumer {
var turbidity = 4.0; private set var turbidity = 4.0; private set
private var gH = (4f/3f) * App.scr.height private var gH = (4f/3f) * App.scr.height
// private var gH = 0.8f * App.scr.height
internal var parallaxPos = 0f; private set internal var parallaxPos = 0f; private set