From 0a8b5f33f400cf4608aad9cfa9fef778a571e24f Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Tue, 22 Aug 2023 09:48:38 +0900
Subject: [PATCH] clouds parallax and can drift in 3D

---
 .../basegame/weathers/WeatherGeneric.json     |  2 +-
 .../terrarum/gameactors/ActorWithBody.kt      |  2 +-
 .../torvald/terrarum/weather/WeatherMixer.kt  | 37 ++++++++++++++++++-
 .../terrarum/weather/WeatherObjectCloud.kt    |  5 +--
 .../terrarum/worlddrawer/WorldCamera.kt       |  3 ++
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/assets/mods/basegame/weathers/WeatherGeneric.json b/assets/mods/basegame/weathers/WeatherGeneric.json
index 267e35124..f31c505f5 100644
--- a/assets/mods/basegame/weathers/WeatherGeneric.json
+++ b/assets/mods/basegame/weathers/WeatherGeneric.json
@@ -5,7 +5,7 @@
   "cloudChance": 20,
   "cloudGamma": [0.48, 1.8],
   "cloudGammaVariance": [0.1, 0.1],
-  "cloudDriftSpeed": 0.3,
+  "cloudDriftSpeed": 0.08,
   "clouds": {
     "large": {
       "filename": "cloud_large.png",
diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
index 554c79a42..1553a97dc 100644
--- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
+++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
@@ -688,7 +688,7 @@ open class ActorWithBody : Actor {
     }
 
     private fun displaceHitbox() {
-        val printdbg1 = true && App.IS_DEVELOPMENT_BUILD
+        val printdbg1 = false && App.IS_DEVELOPMENT_BUILD
         // // HOW IT SHOULD WORK // //
         // ////////////////////////
         // combineVeloToMoveDelta now
diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt
index 9a0634f55..ab3f4d807 100644
--- a/src/net/torvald/terrarum/weather/WeatherMixer.kt
+++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt
@@ -18,7 +18,10 @@ import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.gameworld.WorldTime
 import net.torvald.terrarum.gameworld.WorldTime.Companion.DAY_LENGTH
 import net.torvald.terrarum.RNGConsumer
+import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
 import net.torvald.terrarum.clut.Skybox
+import net.torvald.terrarum.gameactors.Hitbox
+import net.torvald.terrarum.spriteassembler.ADPropertyObject
 import net.torvald.terrarum.utils.JsonFetcher
 import net.torvald.terrarum.utils.forEachSiblings
 import net.torvald.terrarum.worlddrawer.WorldCamera
@@ -110,7 +113,9 @@ internal object WeatherMixer : RNGConsumer {
 
         Arrays.fill(clouds, null)
         cloudsSpawned = 0
-        cloudDriftVector = Vector3(-1f, 0f, 1f)
+        cloudDriftVector = Vector3(1f, 0f, 0f).rotate(Vector3(0f,1f,0f), 192f)
+
+        oldCamPos.set(WorldCamera.camVector)
     }
 
     init {
@@ -182,8 +187,29 @@ internal object WeatherMixer : RNGConsumer {
 
     }
 
+    private val cloudParallaxMultY = -0.035f
+    private val cloudParallaxMultX = -0.035f
     private var cloudUpdateAkku = 0f
+    private val oldCamPos = Vector2(0f, 0f)
+    private val camDelta = Vector2(0f, 0f)
+
     private fun updateClouds(delta: Float, world: GameWorld) {
+        val camvec = WorldCamera.camVector
+        val camvec2 = camvec.cpy()
+        val testCamDelta = camvec.cpy().sub(oldCamPos)
+
+        if (testCamDelta.x.absoluteValue > world.width * TILE_SIZEF / 2f) {
+            if (testCamDelta.x >= 0)
+                camvec2.x -= world.width * TILE_SIZEF
+            else
+                camvec2.x += world.width * TILE_SIZEF
+
+            testCamDelta.set(camvec2.sub(oldCamPos))
+        }
+
+        camDelta.set(testCamDelta)
+
+
         val cloudChanceEveryMin = 60f / (currentWeather.cloudChance * currentWeather.cloudDriftSpeed) // if chance = 0, the result will be +inf
 
         if (cloudUpdateAkku >= cloudChanceEveryMin) {
@@ -193,11 +219,15 @@ internal object WeatherMixer : RNGConsumer {
 
         clouds.forEach {
             it?.let {
+                // do parallax scrolling
+                it.posX += camDelta.x * cloudParallaxMultX
+                it.posY += camDelta.y * cloudParallaxMultY
+
                 it.update(cloudDriftVector, currentWeather.cloudDriftSpeed)
 
                 val pjx = it.posX / it.posZ
 
-                if (pjx !in -1500f..App.scr.wf + 1500f || it.scale < 1f / 2048f) {
+                if (pjx !in -1500f..App.scr.wf + 1500f || it.scale < 1f / 2048f || it.posZ !in 0.001f..100f) {
                     it.flagToDespawn = true
                 }
             }
@@ -212,6 +242,9 @@ internal object WeatherMixer : RNGConsumer {
         }
 
         cloudUpdateAkku += delta
+
+
+        oldCamPos.set(camvec)
     }
 
     private val scrHscaler = App.scr.height / 720f
diff --git a/src/net/torvald/terrarum/weather/WeatherObjectCloud.kt b/src/net/torvald/terrarum/weather/WeatherObjectCloud.kt
index 832f92953..b3e88bb76 100644
--- a/src/net/torvald/terrarum/weather/WeatherObjectCloud.kt
+++ b/src/net/torvald/terrarum/weather/WeatherObjectCloud.kt
@@ -33,9 +33,8 @@ class WeatherObjectCloud(private val texture: TextureRegion, private val flipW:
      * Resulting vector: (x + dX, y + dY, scale * dScale)
      */
     fun update(flowVector: Vector3, gait: Float) {
-        posX += flowVector.x * gait * scale
-        posY += flowVector.y * gait * scale
-        scale *= flowVector.z
+        val vecMult = Vector3(1f, 1f, 1f / (2f * App.scr.hf * 0.35f))
+        pos.add(flowVector.cpy().scl(vecMult).scl(gait))
     }
 
     /**
diff --git a/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt b/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt
index 5ffd7cf58..c747b7e2d 100644
--- a/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt
+++ b/src/net/torvald/terrarum/worlddrawer/WorldCamera.kt
@@ -70,6 +70,9 @@ object WorldCamera {
     var worldHeight = 0
         private set
 
+    inline val camVector: com.badlogic.gdx.math.Vector2
+        get() = com.badlogic.gdx.math.Vector2(gdxCamX, gdxCamY)
+
     fun update(world: GameWorld, player: ActorWithBody?) {
         if (player == null) return