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

cloud spawn: fixing my bad maths

Browse Source
This commit is contained in:
minjaesong
2023-08-28 00:04:00 +09:00
parent 3cce1c0b65
commit 7845146718
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,7 +381,8 @@ internal object WeatherMixer : RNGConsumer {
* Returns random point for clouds to spawn from, in the opposite side of the current wind vector * Returns random point for clouds to spawn from, in the opposite side of the current wind vector
*/ */
private fun getCloudSpawningPosition(cloud: CloudProps, halfCloudSize: Float, windVector: Vector3): Vector3 { private fun getCloudSpawningPosition(cloud: CloudProps, halfCloudSize: Float, windVector: Vector3): Vector3 {
val Z_LIM = ALPHA_ROLLOFF_Z/2f val Z_LIM = ALPHA_ROLLOFF_Z
val Z_POW_BASE = ALPHA_ROLLOFF_Z / 4f
val y = takeUniformRand(-cloud.altHigh..-cloud.altLow) * scrHscaler val y = takeUniformRand(-cloud.altHigh..-cloud.altLow) * scrHscaler
var windVectorDir = toDegrees(atan2(windVector.z.toDouble(), windVector.x.toDouble())).toFloat() + 180f var windVectorDir = toDegrees(atan2(windVector.z.toDouble(), windVector.x.toDouble())).toFloat() + 180f
@@ -405,19 +406,19 @@ internal object WeatherMixer : RNGConsumer {
return when (selectedQuadrant.floorToInt()) { return when (selectedQuadrant.floorToInt()) {
-4, 0, 4 -> { // right side of the screen -4, 0, 4 -> { // right side of the screen
val z = FastMath.interpolateLinear(rr, 1f, ALPHA_ROLLOFF_Z).pow(1.5f) // clouds are more likely to spawn with low Z-value val z = FastMath.interpolateLinear(rr, 1f, Z_POW_BASE).pow(1.5f) // clouds are more likely to spawn with low Z-value
val posXscr = App.scr.width + halfCloudSize val posXscr = App.scr.width + halfCloudSize
val x = WeatherObjectCloud.screenXtoWorldX(posXscr, z) val x = WeatherObjectCloud.screenXtoWorldX(posXscr, z)
Vector3(x, y, z) Vector3(x, y, z)
} }
-3, 1, 5 -> { // z = inf -3, 1, 5 -> { // z = inf
val z = ALPHA_ROLLOFF_Z val z = ALPHA_ROLLOFF_Z
val posXscr = FastMath.interpolateLinear(rr, App.scr.width + halfCloudSize, -halfCloudSize) val posXscr = FastMath.interpolateLinear(rr, -halfCloudSize, App.scr.width + halfCloudSize)
val x = WeatherObjectCloud.screenXtoWorldX(posXscr, Z_LIM) val x = WeatherObjectCloud.screenXtoWorldX(posXscr, Z_LIM)
Vector3(x, y, z) Vector3(x, y, z)
} }
-2, 2, 6 -> { // left side of the screen -2, 2, 6 -> { // left side of the screen
val z = FastMath.interpolateLinear(rr, ALPHA_ROLLOFF_Z, 1f).pow(1.5f) // clouds are more likely to spawn with low Z-value val z = FastMath.interpolateLinear(rr, Z_POW_BASE, 1f).pow(1.5f) // clouds are more likely to spawn with low Z-value
val posXscr = -halfCloudSize val posXscr = -halfCloudSize
val x = WeatherObjectCloud.screenXtoWorldX(posXscr, z) val x = WeatherObjectCloud.screenXtoWorldX(posXscr, z)
Vector3(x, y, z) Vector3(x, y, z)
@@ -471,6 +472,8 @@ internal object WeatherMixer : RNGConsumer {
it.pos.set(precalculatedPos ?: getCloudSpawningPosition(cloud, hCloudSize, windVector)) it.pos.set(precalculatedPos ?: getCloudSpawningPosition(cloud, hCloudSize, windVector))
// if (precalculatedPos == null) printdbg(this, "Z=${it.posZ}")
// further set the random altitude if required // further set the random altitude if required
if (precalculatedPos != null) { if (precalculatedPos != null) {
it.pos.y = takeUniformRand(-cloud.altHigh..-cloud.altLow) * scrHscaler it.pos.y = takeUniformRand(-cloud.altHigh..-cloud.altLow) * scrHscaler