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

sunrise/sunset transition is now longer

Browse Source
This commit is contained in:
minjaesong
2023-08-28 14:30:24 +09:00
parent ce8c53f740
commit 349488376d
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/net/torvald/terrarum/gameworld/WorldTime.kt
View File

@@ -1,6 +1,8 @@
package net.torvald.terrarum.gameworld package net.torvald.terrarum.gameworld
import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.worldgenerator.HALF_PI
import kotlin.math.PI
import kotlin.math.cos import kotlin.math.cos
@@ -56,7 +58,8 @@ import kotlin.math.cos
*/ */
class WorldTime(initTime: Long = 0L) { class WorldTime(initTime: Long = 0L) {
@Transient private val TWO_PI = Math.PI * 2.0 @Transient private val TWO_PI = 6.283185307179586
/** It is not recommended to directly modify the TIME_T. Use provided methods instead. */ /** It is not recommended to directly modify the TIME_T. Use provided methods instead. */
var TIME_T = 0L // Epoch: Year 1 Spring 1st, 0h00:00 (Mondag) // 0001-01-01 var TIME_T = 0L // Epoch: Year 1 Spring 1st, 0h00:00 (Mondag) // 0001-01-01
@@ -122,23 +125,27 @@ class WorldTime(initTime: Long = 0L) {
inline val moonPhase: Double inline val moonPhase: Double
get() = (TIME_T.plus(700000L) % LUNAR_CYCLE).toDouble() / LUNAR_CYCLE get() = (TIME_T.plus(700000L) % LUNAR_CYCLE).toDouble() / LUNAR_CYCLE
fun getSolarElevationAt(ordinalDay: Int, second: Int): Double { private fun kos(x: Double) = x.fmod(TWO_PI).let { x ->
val TIME_T = DAY_LENGTH * ordinalDay + second if (x < PI) 1.0 - (2.0 * x) / PI
else (2.0 * x) / PI - 3.0
}
fun getSolarElevationAt(TIME_T: Long): Double {
val x = (TIME_T % YEAR_SECONDS).toDouble() / DAY_LENGTH + 15 // decimal days. One full day = 1.0 val x = (TIME_T % YEAR_SECONDS).toDouble() / DAY_LENGTH + 15 // decimal days. One full day = 1.0
// 51.56 and 23.44 will make yearly min/max elevation to be 75deg // 51.56 and 23.44 will make yearly min/max elevation to be 75deg
val d = -23.44 * cos(TWO_PI * x / YEAR_DAYS) val d = -23.44 * kos(TWO_PI * x / YEAR_DAYS)
return -51.56 * cos(TWO_PI * x) + d val p = -51.56 * kos(TWO_PI * x)
return d + p
}
fun getSolarElevationAt(ordinalDay: Int, second: Int): Double {
val TIME_T = DAY_LENGTH.toLong() * ordinalDay + second
return getSolarElevationAt(TIME_T)
} }
val solarElevationDeg: Double val solarElevationDeg: Double
get() { get() = getSolarElevationAt(TIME_T)
val x = (TIME_T % YEAR_SECONDS).toDouble() / DAY_LENGTH + 15 // decimal days. One full day = 1.0
// 51.56 and 23.44 will make yearly min/max elevation to be 75deg
val d = -23.44 * cos(TWO_PI * x / YEAR_DAYS)
val p = -51.56 * cos(TWO_PI * x)
return d + p
}
val solarElevationRad: Double val solarElevationRad: Double
get() = Math.toRadians(solarElevationDeg) get() = Math.toRadians(solarElevationDeg)