Currents overhaul

assets/textures/CurrentsNoise1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://nf7opycrmbhf"
+path="res://.godot/imported/CurrentsNoise1.png-58107ef5cf750e05da51f0b59591a322.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/CurrentsNoise1.png"
+dest_files=["res://.godot/imported/CurrentsNoise1.png-58107ef5cf750e05da51f0b59591a322.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/textures/CurrentsNoise2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cf25131bt7raj"
+path="res://.godot/imported/CurrentsNoise2.png-8ef43f43a67c15804cdfc4dfd72cf4e5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/CurrentsNoise2.png"
+dest_files=["res://.godot/imported/CurrentsNoise2.png-8ef43f43a67c15804cdfc4dfd72cf4e5.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/textures/TrailParticle.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dufk485jxbiin"
+path.s3tc="res://.godot/imported/TrailParticle.png-5f501eb2997a563343275ee00dc94c86.s3tc.ctex"
+path.etc2="res://.godot/imported/TrailParticle.png-5f501eb2997a563343275ee00dc94c86.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/textures/TrailParticle.png"
+dest_files=["res://.godot/imported/TrailParticle.png-5f501eb2997a563343275ee00dc94c86.s3tc.ctex", "res://.godot/imported/TrailParticle.png-5f501eb2997a563343275ee00dc94c86.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

shaders/CurrentsParticles.gdshader

@@ -7,24 +7,17 @@ uniform sampler2D alphaCurve : repeat_disable;
 
 uniform float gameTime;
 
-uniform sampler3D noiseDisturbancesX;
-uniform sampler3D noiseDisturbancesY;
-
-uniform sampler3D noiseCurrentsX;
-uniform sampler3D noiseCurrentsY;
+uniform sampler2D noiseCurrents1;
+uniform sampler2D noiseCurrents2;
 
 uniform float speed;
 uniform float chaoticness;
-uniform float scale;
+uniform float inverseScale;
 
 uniform float brightness;
 
 // The following constants should be the same as in FluidCurrentsSystem.cs
-const float disturbanceTimescale = 1.0f;
-const float currentsTimescale = 1.0f / 500.0f;
-const float currentsStretchingMultiplier = 1.0f / 10.0f;
-const float disturbanceToCurrentsRatio = 0.15f;
-const float minCurrentIntensity = 0.25f;
+const float currentsTimescale = 0.25f;
 const float positionScaling = 0.9f;
 
 // Generates a random float and modifies the seed
@@ -66,41 +59,32 @@ void start() {
     TRANSFORM[0].xyz *= visibleScale;
     TRANSFORM[1].xyz *= visibleScale;
     TRANSFORM[2].xyz *= visibleScale;
+    CUSTOM.w = RandFromSeed(altSeed) * 0.2f + 0.8f;
 }
 
 void process() {
     CUSTOM.y += DELTA;
-    float lifetimePercent = CUSTOM.y / LIFETIME;
+    float lifetimePercent = CUSTOM.y / (LIFETIME - 7.0f);
     if (CUSTOM.y > LIFETIME) {
         ACTIVE = false;
     }
 
     vec2 current;
     {
         // The following should strictly conform to the formula in FluidCurrentSystem.cs
-        vec2 position = TRANSFORM[3].xz * positionScaling * scale;
-
-        float disturbanceX = texture(noiseDisturbancesX,
-            vec3(position / 128.0f, gameTime * chaoticness * disturbanceTimescale / 64.0f)).r;
-        float disturbanceY = texture(noiseDisturbancesY,
-            vec3(position / 128.0f, gameTime * chaoticness * disturbanceTimescale / 64.0f)).r;
-
-        float currentX = texture(noiseCurrentsX,
-            vec3(position.x * currentsStretchingMultiplier / 128.0f, position.y / 128.0f,
-                gameTime * currentsTimescale * chaoticness / 64.0f)).r; 
-        float currentY = texture(noiseCurrentsY,
-            vec3(position.x / 128.0f, position.y * currentsStretchingMultiplier / 128.0f,
-                gameTime * currentsTimescale * chaoticness / 64.0f)).r;
+        vec2 scaledPosition = TRANSFORM[3].xz * positionScaling * inverseScale;
+        float scaledTime = gameTime * currentsTimescale * chaoticness;
 
-        vec2 disturbances = vec2(disturbanceX, disturbanceY) * 2.0f - 1.0f;
-        vec2 currents = vec2(currentX, currentY) * 2.0f - 1.0f;
+        vec2 current1 = texture(noiseCurrents1,
+            vec2((scaledPosition.x + scaledTime) / 1024.0f,
+                (scaledPosition.y + scaledTime) / 1024.0f)).rg;
+        vec2 current2 = texture(noiseCurrents2,
+            vec2((scaledPosition.x - scaledTime) / 1024.0f,
+                (scaledPosition.y - scaledTime) / 1024.0f)).rg;
 
-        if (pow(currents.x, 2) + pow(currents.y, 2) < minCurrentIntensity)
-        {
-            currents = vec2(0.0f);
-        }
+        current = current1 * 2.0f - 1.0f;
+        current *= current2;
 
-        current = mix(currents, disturbances, disturbanceToCurrentsRatio);
         current *= 10.0f * speed;
     }
 
@@ -109,6 +93,7 @@ void process() {
     TRANSFORM[3].xyz += VELOCITY * DELTA;
 
     vec4 finalColor = colorValue;
+    finalColor.rgb *= CUSTOM.w;
     finalColor.a *= texture(alphaCurve, vec2(lifetimePercent)).r;
     if (speed != 0.0)
     {

simulation_parameters/Constants.cs

@@ -389,6 +389,8 @@ public static class Constants
     /// </summary>
     public const float CURRENT_FORCE_CELL_MULTIPLIER = 15;
 
+    public const float CURRENT_COMPOUND_CLOUD_ADVECT_THRESHOLD = 0.15f;
+
     public const int TRANSLATION_VERY_INCOMPLETE_THRESHOLD = 30;
     public const int TRANSLATION_INCOMPLETE_THRESHOLD = 70;