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

weatherbox is now owned by the world

Browse Source
This commit is contained in:
minjaesong
2023-09-04 14:59:12 +09:00
parent 08b1d93d54
commit 7b3ac9cd06
23 changed files with 260 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/weather/BaseModularWeather.kt
View File

@@ -25,6 +25,7 @@ data class BaseModularWeather(
val cloudChance: Float,
val windSpeed: Float,
val windSpeedVariance: Float,
val windSpeedDamping: Float,
val cloudGamma: Vector2,
val cloudGammaVariance: Vector2,
var clouds: List<CloudProps>, // sorted by CloudProps.probability
@@ -36,9 +37,10 @@ data class BaseModularWeather(
/**
* @param rnd random number between -1 and +1
*/
fun getRandomWindSpeed(rnd: Float): Float {
fun getRandomWindSpeed(old: Float, rnd: Float): Float {
val v = 1f + rnd.absoluteValue * windSpeedVariance
return if (rnd < 0) windSpeed / v else windSpeed * v
val r = if (rnd < 0) windSpeed / v else windSpeed * v
return FastMath.interpolateLinear(windSpeedDamping, old, r)
}
fun getRandomCloudGamma(rnd1: Float, rnd2: Float): Vector2 {

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

@@ -60,6 +60,7 @@ internal object WeatherMixer : RNGConsumer {
0f,
0f,
0f,
0f,
Vector2(1f, 1f),
Vector2(0f, 0f),
listOf()
@@ -72,10 +73,6 @@ internal object WeatherMixer : RNGConsumer {
val weatherDB: HashMap<String, ArrayList<BaseModularWeather>> // search by classification
val weatherDict: HashMap<String, BaseModularWeather> // search by identifier
val currentWeather: BaseModularWeather
get() = weatherbox.currentWeather
// var nextWeather: BaseModularWeather
private var forceWindVec: Vector3? = null
val globalLightNow = Cvec(0)
@@ -106,9 +103,6 @@ internal object WeatherMixer : RNGConsumer {
private var astrumOffY = 0f
var weatherbox = Weatherbox()
// Clouds are merely a response to the current Weatherbox status //
private val clouds = SortedArrayList<WeatherObjectCloud>()
@@ -118,15 +112,15 @@ internal object WeatherMixer : RNGConsumer {
val cloudSpawnMax: Int
get() = 256 shl (App.getConfigInt("maxparticles") / 256)
override fun loadFromSave(s0: Long, s1: Long) {
super.loadFromSave(s0, s1)
override fun loadFromSave(ingame: IngameInstance, s0: Long, s1: Long) {
super.loadFromSave(ingame, s0, s1)
internalReset(s0, s1)
initClouds()
initClouds(ingame.world.weatherbox.currentWeather)
}
fun internalReset() {
fun internalReset(ingame: IngameInstance) {
internalReset(RNG.state0, RNG.state1)
initClouds()
initClouds(ingame.world.weatherbox.currentWeather)
}
fun internalReset(s0: Long, s1: Long) {
@@ -144,27 +138,6 @@ internal object WeatherMixer : RNGConsumer {
windVector = Vector3(-0.98f, 0f, 0.21f)
oldCamPos.set(WorldCamera.camVector)
weatherbox = Weatherbox()
weatherbox.initWith(weatherDict["generic01"]!!, 7200L)
// TEST FILL WITH RANDOM VALUES
(0..6).map { takeUniformRand(0f..1f) }.let {
weatherbox.windDir.pM2 = it[1]
weatherbox.windDir.pM1 = it[2]
weatherbox.windDir.p0 = it[3]
weatherbox.windDir.p1 = it[4]
weatherbox.windDir.p2 = it[5]
weatherbox.windDir.p3 = it[6]
}
(0..6).map { takeUniformRand(-1f..1f) }.let {
weatherbox.windSpeed.pM2 = currentWeather.getRandomWindSpeed(it[1])
weatherbox.windSpeed.pM1 = currentWeather.getRandomWindSpeed(it[2])
weatherbox.windSpeed.p0 = currentWeather.getRandomWindSpeed(it[3])
weatherbox.windSpeed.p1 = currentWeather.getRandomWindSpeed(it[4])
weatherbox.windSpeed.p2 = currentWeather.getRandomWindSpeed(it[5])
weatherbox.windSpeed.p3 = currentWeather.getRandomWindSpeed(it[6])
}
}
init {
@@ -206,8 +179,8 @@ internal object WeatherMixer : RNGConsumer {
// currentWeather = weatherList[WEATHER_GENERIC]!![0] // force set weather
weatherbox.update(world)
updateWind()
world.weatherbox.update(world)
updateWind(world.weatherbox)
updateClouds(delta, world)
@@ -236,7 +209,7 @@ internal object WeatherMixer : RNGConsumer {
if (it > PI) it - TWO_PI else it
}
private fun updateWind() {
private fun updateWind(weatherbox: Weatherbox) {
val currentWindSpeed = weatherbox.windSpeed.value
val currentWindDir = weatherbox.windDir.value * HALF_PI
@@ -270,6 +243,7 @@ internal object WeatherMixer : RNGConsumer {
val camvec = WorldCamera.camVector
val camvec2 = camvec.cpy()
val testCamDelta = camvec.cpy().sub(oldCamPos)
val currentWeather = world.weatherbox.currentWeather
// adjust camDelta to accomodate ROUNDWORLD
if (testCamDelta.x.absoluteValue > world.width * TILE_SIZEF / 2f) {
@@ -353,11 +327,11 @@ internal object WeatherMixer : RNGConsumer {
private val scrHscaler = App.scr.height / 720f
private val cloudSizeMult = App.scr.wf / TerrarumScreenSize.defaultW
private fun takeUniformRand(range: ClosedFloatingPointRange<Float>) =
fun takeUniformRand(range: ClosedFloatingPointRange<Float>) =
FastMath.interpolateLinear(Math.random().toFloat(), range.start, range.endInclusive)
private fun takeTriangularRand(range: ClosedFloatingPointRange<Float>) =
fun takeTriangularRand(range: ClosedFloatingPointRange<Float>) =
FastMath.interpolateLinear((Math.random() + Math.random()).div(2f).toFloat(), range.start, range.endInclusive)
private fun takeGaussianRand(range: ClosedFloatingPointRange<Float>) =
fun takeGaussianRand(range: ClosedFloatingPointRange<Float>) =
FastMath.interpolateLinear((Math.random() + Math.random() + Math.random() + Math.random() + Math.random() + Math.random() + Math.random() + Math.random()).div(8f).toFloat(), range.start, range.endInclusive)
/**
@@ -481,7 +455,7 @@ internal object WeatherMixer : RNGConsumer {
}
}
private fun initClouds() {
private fun initClouds(currentWeather: BaseModularWeather) {
val hCloudSize = 1024f
// multiplier is an empirical value that depends on the 'rZ'
// it does converge at ~6, but having it as an initial state does not make it stay converged
@@ -498,10 +472,10 @@ internal object WeatherMixer : RNGConsumer {
}
}
internal fun titleScreenInitWeather() {
internal fun titleScreenInitWeather(weatherbox: Weatherbox) {
weatherbox.initWith(weatherDict["titlescreen"]!!, Long.MAX_VALUE)
forceWindVec = Vector3(-0.98f, 0f, -0.21f).scl(1f/30f) // value taken from TitleScreen.kt; search for 'demoWorld.worldTime.timeDelta = '
initClouds()
initClouds(weatherbox.currentWeather)
}
private fun <T> Array<T?>.addAtFreeSpot(obj: T) {
@@ -545,6 +519,7 @@ internal object WeatherMixer : RNGConsumer {
private val turbidityDomainSize = 533.3333f
private fun drawSkybox(camera: OrthographicCamera, batch: FlippingSpriteBatch, world: GameWorld) {
val currentWeather = world.weatherbox.currentWeather
val parallaxZeroPos = (world.height / 3f)
// we will not care for nextSkybox for now
@@ -650,7 +625,7 @@ internal object WeatherMixer : RNGConsumer {
/**
* Get a GL of specific time
*/
fun getGlobalLightOfTimeOfNoon(): Cvec {
fun getGlobalLightOfTimeOfNoon(currentWeather: BaseModularWeather): Cvec {
currentWeather.daylightClut.let { it.get(it.width - 1, 0) }.let {
return Cvec(it.r, it.g, it.b, it.a)
}
@@ -804,6 +779,7 @@ internal object WeatherMixer : RNGConsumer {
cloudChance = JSON.getFloat("cloudChance"),
windSpeed = JSON.getFloat("windSpeed"),
windSpeedVariance = JSON.getFloat("windSpeedVariance"),
windSpeedDamping = JSON.getFloat("windSpeedDamping"),
cloudGamma = JSON["cloudGamma"].asFloatArray().let { Vector2(it[0], it[1]) },
cloudGammaVariance = JSON["cloudGammaVariance"].asFloatArray().let { Vector2(it[0], it[1]) },
clouds = cloudsMap,

11
src/net/torvald/terrarum/weather/Weatherbox.kt
View File

@@ -15,7 +15,7 @@ class Weatherbox {
companion object {
private val WIND_DIR_TIME_UNIT = 3600f * 6 // every 6hr
private val WIND_SPEED_TIME_UNIT = 3600f * 1 // every 2hr
private val WIND_SPEED_TIME_UNIT = 360f * 5 // every 0.5hr
private val HALF_PIF = 1.5707964f
private val PIF = 3.1415927f
@@ -44,6 +44,7 @@ class Weatherbox {
get() = weatherSchedule[0].duration
fun initWith(initWeather: BaseModularWeather, duration: Long) {
weatherSchedule.clear()
weatherSchedule.add(WeatherSchedule(initWeather, duration))
}
@@ -70,8 +71,8 @@ class Weatherbox {
}
private fun updateWind(world: GameWorld) {
windSpeed.update(world.worldTime.timeDelta / WIND_SPEED_TIME_UNIT) {
currentWeather.getRandomWindSpeed(takeUniformRand(-1f..1f))
windSpeed.update(world.worldTime.timeDelta / WIND_SPEED_TIME_UNIT) { lastValue ->
currentWeather.getRandomWindSpeed(lastValue, takeUniformRand(-1f..1f))
}
windDir.update( world.worldTime.timeDelta / WIND_DIR_TIME_UNIT) { RNG.nextFloat() * 4f }
}
@@ -120,7 +121,7 @@ open class WeatherStateBox(
}
open fun update(xdelta: Float, next: () -> Float) {
open fun update(xdelta: Float, next: (Float) -> Float) {
// if (!::polynomial.isInitialized) updatePolynomials()
synchronized(WeatherMixer.RNG) {
@@ -132,7 +133,7 @@ open class WeatherStateBox(
p0 = p1
p1 = p2
p2 = p3
p3 = next()
p3 = next(p2)
}
// updatePolynomials()
}