Water current visuals

Thrive.sln.DotSettings

@@ -586,6 +586,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=carbondioxide/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Carriable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cellulase/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=chaoticness/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Chemereception/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Chemolithoautotrophy/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=chemoplast/@EntryIndexedValue">True</s:Boolean>

shaders/CurrentsParticles.gdshader

@@ -0,0 +1,118 @@
+shader_type particles;
+render_mode disable_velocity;
+
+uniform vec3 emissionBoxExtents;
+uniform vec4 colorValue : source_color;
+uniform sampler2D alphaCurve : repeat_disable;
+
+uniform float gameTime;
+
+uniform sampler3D noiseDisturbancesX;
+uniform sampler3D noiseDisturbancesY;
+
+uniform sampler3D noiseCurrentsX;
+uniform sampler3D noiseCurrentsY;
+
+uniform float speed;
+uniform float chaoticness;
+uniform float scale;
+
+// 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.50f;
+const float positionScaling = 0.9f;
+
+// Generates a random float and modifies the seed
+float RandFromSeed(inout uint seed) {
+    int k;
+    int s = int(seed);
+    if (s == 0) {
+        s = 305420679;
+    }
+    k = s / 127773;
+    s = 16807 * (s - k * 127773) - 2836 * k;
+    if (s < 0) {
+        s += 2147483647;
+    }
+    seed = uint(s);
+    return float(seed % uint(65536)) / 65535.0;
+}
+
+uint Hash(uint x) {
+    x = ((x >> uint(16)) ^ x) * uint(73244475);
+    x = ((x >> uint(16)) ^ x) * uint(73244475);
+    x = (x >> uint(16)) ^ x;
+    return x;
+}
+
+void start() {
+    uint baseNumber = NUMBER;
+    uint altSeed = Hash(baseNumber + uint(1) + RANDOM_SEED);
+
+    CUSTOM = vec4(0.0);
+    COLOR = colorValue;
+    TRANSFORM[0].xyz = vec3(1.0, 0.0, 0.0);
+    TRANSFORM[1].xyz = vec3(0.0, 1.0, 0.0);
+    TRANSFORM[2].xyz = vec3(0.0, 0.0, 1.0);
+    TRANSFORM[3].xyz = vec3(RandFromSeed(altSeed) * 2.0 - 1.0, RandFromSeed(altSeed) * 2.0 - 1.0,
+        RandFromSeed(altSeed) * 2.0 - 1.0) * emissionBoxExtents;
+    TRANSFORM = EMISSION_TRANSFORM * TRANSFORM;
+    float visibleScale = RandFromSeed(altSeed) * 0.75f + 0.625f;
+    TRANSFORM[0].xyz *= visibleScale;
+    TRANSFORM[1].xyz *= visibleScale;
+    TRANSFORM[2].xyz *= visibleScale;
+}
+
+void process() {
+    CUSTOM.y += DELTA;
+    float lifetimePercent = CUSTOM.y / LIFETIME;
+    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, gameTime * chaoticness * disturbanceTimescale) / 64.0f).r;
+        float disturbanceY = texture(noiseDisturbancesY,
+            vec3(position, gameTime * chaoticness * disturbanceTimescale) / 64.0f).r;
+
+        float currentX = texture(noiseCurrentsX,
+            vec3(position.x * currentsStretchingMultiplier, position.y, gameTime * currentsTimescale * chaoticness)
+            / 64.0f).r; 
+        float currentY = texture(noiseCurrentsY,
+            vec3(position.x, position.y * currentsStretchingMultiplier, gameTime * currentsTimescale * chaoticness)
+            / 64.0f).r;
+
+        vec2 disturbances = vec2(disturbanceX, disturbanceY) * 2.0f - 1.0f;
+        vec2 currents = vec2(currentX, currentY) * 2.0f - 1.0f;
+
+        if (pow(currents.x, 2) + pow(currents.y, 2) < minCurrentIntensity)
+        {
+            currents = vec2(0.0f);
+        }
+
+        current = mix(currents, disturbances, disturbanceToCurrentsRatio);
+        current *= 10.0f * speed;
+    }
+
+    VELOCITY = mix(vec3(current.x, 0.0f, current.y), VELOCITY, 1.0f - DELTA * 5.0f);
+
+    TRANSFORM[3].xyz += VELOCITY * DELTA;
+
+    vec4 finalColor = colorValue;
+    finalColor.a *= texture(alphaCurve, vec2(lifetimePercent)).r;
+    if (speed != 0.0)
+    {
+        // The faster the particle, the more visible it is
+        finalColor.a *= 0.2f + 0.8f * length(VELOCITY) / (speed * 10.0f);
+    }
+
+    COLOR = finalColor;
+}

shaders/CurrentsParticles.gdshader.uid

@@ -0,0 +1 @@
+uid://erlcc6rxb1cy

simulation_parameters/Constants.cs

@@ -360,7 +360,7 @@ public static class Constants
     /// <summary>
     ///   The maximum force that can be applied by currents in the fluid system
     /// </summary>
-    public const float MAX_FORCE_APPLIED_BY_CURRENTS = 1200;
+    public const float MAX_FORCE_APPLIED_BY_CURRENTS = 2000;
 
     public const int TRANSLATION_VERY_INCOMPLETE_THRESHOLD = 30;
     public const int TRANSLATION_INCOMPLETE_THRESHOLD = 70;

simulation_parameters/microbe_stage/biomes.json

@@ -20,6 +20,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 1.0,
+    "WaterCurrentChaoticness": 1.2,
+    "WaterCurrentScale": 1.0,
+    "WaterCurrentParticleCount": 500,
     "CompoundCloudBrightness": 1.3,
     "GasVolume": 1,
     "Conditions": {
@@ -201,6 +205,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 0.6,
+    "WaterCurrentChaoticness": 0.5,
+    "WaterCurrentScale": 0.6,
+    "WaterCurrentParticleCount": 350,
     "ActiveMusicContexts": [
       "PatchVents"
     ],
@@ -527,6 +535,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 1.5,
+    "WaterCurrentChaoticness": 1.75,
+    "WaterCurrentScale": 1.0,
+    "WaterCurrentParticleCount": 900,
     "ActiveMusicContexts": [
       "PatchTidepool"
     ],
@@ -774,6 +786,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 0.75,
+    "WaterCurrentChaoticness": 0.75,
+    "WaterCurrentScale": 0.8,
+    "WaterCurrentParticleCount": 600,
     "GasVolume": 1,
     "Conditions": {
       "Chunks": {
@@ -983,6 +999,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 0.65,
+    "WaterCurrentChaoticness": 0.65,
+    "WaterCurrentScale": 0.9,
+    "WaterCurrentParticleCount": 400,
     "GasVolume": 1,
     "Conditions": {
       "Chunks": {
@@ -1242,6 +1262,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 0.8,
+    "WaterCurrentChaoticness": 0.8,
+    "WaterCurrentScale": 0.8,
+    "WaterCurrentParticleCount": 450,
     "GasVolume": 1,
     "Conditions": {
       "Chunks": {
@@ -1534,6 +1558,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 1.5,
+    "WaterCurrentChaoticness": 2.0,
+    "WaterCurrentScale": 1.0,
+    "WaterCurrentParticleCount": 800,
     "CompoundCloudBrightness": 2.5,
     "GasVolume": 1,
     "TemperatureVarianceScale": 15,
@@ -1778,6 +1806,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 0.5,
+    "WaterCurrentChaoticness": 1.0,
+    "WaterCurrentScale": 1.0,
+    "WaterCurrentParticleCount": 500,
     "GasVolume": 1,
     "Conditions": {
       "Chunks": {
@@ -2112,6 +2144,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 0.6,
+    "WaterCurrentChaoticness": 0.75,
+    "WaterCurrentScale": 1.0,
+    "WaterCurrentParticleCount": 450,
     "ActiveMusicContexts": [
       "PatchIceShelf"
     ],
@@ -2394,6 +2430,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 1.5,
+    "WaterCurrentChaoticness": 2.5,
+    "WaterCurrentScale": 1.75,
+    "WaterCurrentParticleCount": 900,
     "CompoundCloudBrightness": 2.5,
     "GasVolume": 1,
     "TemperatureVarianceScale": 18,
@@ -2688,6 +2728,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 0.75,
+    "WaterCurrentChaoticness": 0.75,
+    "WaterCurrentScale": 0.8,
+    "WaterCurrentParticleCount": 450,
     "GasVolume": 1,
     "Conditions": {
       "Chunks": {
@@ -3036,6 +3080,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 1.5,
+    "WaterCurrentChaoticness": 1.5,
+    "WaterCurrentScale": 1.0,
+    "WaterCurrentParticleCount": 750,
     "CompoundCloudBrightness": 2.2,
     "GasVolume": 1,
     "Conditions": {
@@ -3269,6 +3317,10 @@
         "z": 0.75
       }
     },
+    "WaterCurrentSpeed": 1.0,
+    "WaterCurrentChaoticness": 1.0,
+    "WaterCurrentScale": 1.0,
+    "WaterCurrentParticleCount": 500,
     "GasVolume": 1,
     "Conditions": {
       "Chunks": {

src/general/MainMenu.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=69 format=3 uid="uid://c1fc2aip6oiqt"]
 
 [ext_resource type="Theme" uid="uid://b4cx0o110g4b6" path="res://src/gui_common/thrive_theme.tres" id="1"]
-[ext_resource type="PackedScene" path="res://src/saving/SaveManagerGUI.tscn" id="2"]
+[ext_resource type="PackedScene" uid="uid://8to431fk1dnp" path="res://src/saving/SaveManagerGUI.tscn" id="2"]
 [ext_resource type="PackedScene" uid="uid://khgb1ctp1e5o" path="res://src/general/OptionsMenu.tscn" id="3"]
 [ext_resource type="PackedScene" uid="uid://cl64wvnxs6ivs" path="res://src/gui_common/dialogs/CustomConfirmationDialog.tscn" id="4"]
 [ext_resource type="Script" uid="uid://cmmb0y16fbk1e" path="res://src/gui_common/VersionNumber.cs" id="5"]
@@ -13,7 +13,7 @@
 [ext_resource type="Texture2D" uid="uid://dpxsicy6au2mh" path="res://assets/misc/thrive_logo_big.png" id="10"]
 [ext_resource type="PackedScene" uid="uid://cqwy12d33agr4" path="res://src/gui_common/CreditsScroll.tscn" id="11"]
 [ext_resource type="PackedScene" uid="uid://c120hjc04sice" path="res://src/gui_common/dialogs/LicensesDisplay.tscn" id="12"]
-[ext_resource type="PackedScene" path="res://src/gui_common/dialogs/CustomWindow.tscn" id="12_a6o4c"]
+[ext_resource type="PackedScene" uid="uid://du8sc8kjirguk" path="res://src/gui_common/dialogs/CustomWindow.tscn" id="12_a6o4c"]
 [ext_resource type="Texture2D" uid="uid://bv0644lcfansy" path="res://assets/textures/gui/social_media/discord.png" id="13"]
 [ext_resource type="PackedScene" uid="uid://d06pkd2hx1syf" path="res://src/modding/ModManager.tscn" id="14"]
 [ext_resource type="PackedScene" uid="uid://2nt57gfubafw" path="res://src/gui_common/dialogs/ErrorDialog.tscn" id="15"]
@@ -893,7 +893,7 @@ layout_mode = 1
 
 [node name="GUIAnimations" type="AnimationPlayer" parent="."]
 libraries = {
-"": SubResource("AnimationLibrary_wp2ig")
+&"": SubResource("AnimationLibrary_wp2ig")
 }
 
 [node name="OpenGLWarningPopup" parent="." instance=ExtResource("4")]

src/microbe_stage/Biome.cs

@@ -44,6 +44,14 @@ public class Biome : IRegistryType
 
     public float CompoundCloudBrightness = 1.0f;
 
+    public float WaterCurrentSpeed = 1.0f;
+
+    public float WaterCurrentChaoticness = 1.0f;
+
+    public float WaterCurrentScale = 1.0f;
+
+    public int WaterCurrentParticleCount = 300;
+
     /// <summary>
     ///   Total gas volume of this biome when it is a single patch.
     /// </summary>