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

longer sunsets to the skybox model

Browse Source
This commit is contained in:
minjaesong
2023-09-26 00:37:35 +09:00
parent 930c55c297
commit d9151377f6
6 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/clut/skybox.png LFS
View File

Binary file not shown.

BIN
assets/clut/skyboxavr.png LFS
View File

Binary file not shown.

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.

18
src/net/torvald/parametricsky/Application.kt
View File

@@ -188,8 +188,12 @@ class Application(val WIDTH: Int, val HEIGHT: Int) : Game() {
val ys2 = ArrayList<Float>() val ys2 = ArrayList<Float>()
val halfHeight = oneScreen.height * 0.5 val halfHeight = oneScreen.height * 0.5
val elevation = if (elevation.abs() < 0.0001) Math.toRadians(0.5) else elevation // dealing with the edge case
val elevationDeg = Math.toDegrees(elevation) val elevationDeg = Math.toDegrees(elevation)
for (x in 0 until oneScreen.width) { for (x in 0 until oneScreen.width) {
for (y in 0 until oneScreen.height) { for (y in 0 until oneScreen.height) {
@@ -204,9 +208,10 @@ class Application(val WIDTH: Int, val HEIGHT: Int) : Game() {
val yi = yp - 3 val yi = yp - 3
val xf = -elevationDeg / 90.0 val xf = -elevationDeg / 90.0
var yf = (yi / 58.0).coerceIn(0.0, 1.0).mapCircle().coerceInSmoothly(0.0, 0.95) var yf = (yi / 58.0).coerceIn(0.0, 1.0).mapCircle().coerceInSmoothly(0.0, 0.95)
if (elevationDeg < 0) yf *= Skybox.superellipsoidDecay(1.0 / 3.0, xf) // if (elevationDeg < 0) yf *= Skybox.superellipsoidDecay(1.0 / 3.0, xf)
val theta = yf * HALF_PI val theta = yf * HALF_PI
val gamma = if (y < halfHeight) Math.toRadians(cameraHeading) else Math.toRadians(cameraHeading + 180) val gammaPair = if (y < halfHeight) 0 else 1
val gamma = Math.toRadians(115 + 25 * cos(PI * elevationDeg / 40)) + (gammaPair * PI)
val xyz = CIEXYZ( val xyz = CIEXYZ(
@@ -217,7 +222,7 @@ class Application(val WIDTH: Int, val HEIGHT: Int) : Game() {
val xyz2 = xyz.scaleToFit(elevation) val xyz2 = xyz.scaleToFit(elevation)
ys.add(xyz.Y) ys.add(xyz.Y)
ys2.add(xyz2.Y) ys2.add(xyz2.Y)
val rgb = xyz2.toRGB().toColor() val rgb = xyz2.toRGB().toColor().gamma(1.2f)
rgb.a = 1f rgb.a = 1f
/*val rgb2 = Color( /*val rgb2 = Color(
@@ -241,6 +246,13 @@ class Application(val WIDTH: Int, val HEIGHT: Int) : Game() {
//System.exit(0) //System.exit(0)
} }
private fun Color.gamma(gam: Float): Color {
this.r = this.r.pow(gam)
this.g = this.g.pow(gam)
this.b = this.b.pow(gam)
return this
}
override fun create() { override fun create() {
batch = SpriteBatch() batch = SpriteBatch()

6
src/net/torvald/terrarum/clut/GenerateSkyboxTextureAtlas.kt
View File

@@ -48,9 +48,9 @@ class GenerateSkyboxTextureAtlas {
var yf = (yi / 58.0).coerceIn(0.0, 1.0).mapCircle().coerceInSmoothly(0.0, 0.95) var yf = (yi / 58.0).coerceIn(0.0, 1.0).mapCircle().coerceInSmoothly(0.0, 0.95)
// experiments visualisation: https://www.desmos.com/calculator/5crifaekwa // experiments visualisation: https://www.desmos.com/calculator/5crifaekwa
// if (elevationDeg < 0) yf *= 1.0 - pow(xf, 0.333) // if (elevationDeg < 0) yf *= 1.0 - pow(xf, 0.333)
// if (elevationDeg < 0) yf *= -2.0 * asin(xf - 1.0) / PI // if (elevationDeg < 0) yf *= -2.0 * asin(xf - 1.0) / PI
if (elevationDeg < 0) yf *= Skybox.superellipsoidDecay(1.0 / 3.0, xf) // if (elevationDeg < 0) yf *= Skybox.superellipsoidDecay(1.0 / 3.0, xf)
val theta = yf * HALF_PI val theta = yf * HALF_PI
// vertical angle, where 0 is zenith, ±90 is ground (which is odd) // vertical angle, where 0 is zenith, ±90 is ground (which is odd)