Caching, visuals and performance tweaks

Author: CI09

assets/textures/gui/bevel/MapDotIndicator.svg

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cbkfqk0lk6dhl"
+path="res://.godot/imported/MapDotIndicator.svg-0118f3fb709521b7aea1c36f416e97e1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/textures/gui/bevel/MapDotIndicator.svg"
+dest_files=["res://.godot/imported/MapDotIndicator.svg-0118f3fb709521b7aea1c36f416e97e1.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
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

assets/textures/gui/bevel/MapDotIndicator.svg.import

@@ -11,6 +11,8 @@ public partial class PatchMapDrawer : Control
     [Export]
     public bool DrawDefaultMapIfEmpty;
 
+    public uint PlayerSpeciesID = int.MaxValue;
+
     [Export(PropertyHint.ColorNoAlpha)]
     public Color InterConnectionColor = Colors.WebGreen;
 
@@ -48,6 +50,9 @@ public partial class PatchMapDrawer : Control
     private PackedScene populationIndicatorScene = null!;
     private Control patchNodeContainer = null!;
     private Control lineContainer = null!;
+
+    [Export]
+    private Control populationIndicatorContainer = null!;
 #pragma warning restore CA2213
 
     private PatchMap map = null!;
@@ -56,6 +61,8 @@ public partial class PatchMapDrawer : Control
 
     private bool alreadyDrawn;
 
+    private List<Control> playerSpeciesPopulationIndicators = new();
+
     private Dictionary<Patch, bool>? patchEnableStatusesToBeApplied;
 
     private Patch? selectedPatch;
@@ -142,11 +149,6 @@ public Patch? SelectedPatch
     /// </summary>
     public Action<PatchMapDrawer>? OnSelectedPatchChanged { get; set; }
 
-    /// <summary>
-    ///   Player species ID for player population indicator (dots on patch map)
-    /// </summary>
-    public uint PlayerSpeciesID { get; set; }
-
     public override void _Ready()
     {
         base._Ready();
@@ -1055,6 +1057,13 @@ private void DrawPatchLinks()
     /// </summary>
     private void RebuildMap()
     {
+        playerSpeciesPopulationIndicators = new();
+        foreach (var node in populationIndicatorContainer.GetChildren())
+        {
+            if (node is Control indicator)
+                playerSpeciesPopulationIndicators.Add(indicator);
+        }
+
         patchNodeContainer.FreeChildren();
         nodes.Clear();
         connections.Clear();
@@ -1120,18 +1129,54 @@ private void AddPatchNode(Patch patch, Vector2 position)
         var playerSpecies = patch.FindSpeciesByID(PlayerSpeciesID);
         if (playerSpecies != null)
         {
-            var playerPopulation = patch.GetSpeciesSimulationPopulation(playerSpecies);
+            var playerPopulationIndicatorAmount = (int)Math.Ceiling(
+                patch.GetSpeciesSimulationPopulation(playerSpecies) * 0.004);
+
+            var indicatorExcess = Mathf.Clamp(
+                playerSpeciesPopulationIndicators.Count - playerPopulationIndicatorAmount, 0, playerSpeciesPopulationIndicators.Count);
+
+            for (int i = 0; i < indicatorExcess; ++i)
+            {
+                playerSpeciesPopulationIndicators.Last().QueueFree();
+            }
 
-            for (var i = 0; i < playerPopulation * 0.001; ++i)
+            // Trip the list to keep it clean of disposed objects
+            var range = playerSpeciesPopulationIndicators.Count - indicatorExcess;
+            if (range > 0)
+                playerSpeciesPopulationIndicators = playerSpeciesPopulationIndicators.GetRange(0, range);
+
+            for (int i = 0; i < playerPopulationIndicatorAmount; ++i)
             {
-                var indicator = populationIndicatorScene.Instantiate<PatchMapPopulationIndicator>();
-                indicator.IndicatorPositionModifier = i;
+                var noCached = i >= playerSpeciesPopulationIndicators.Count;
+
+                Control indicator;
+                if (noCached)
+                {
+                    indicator = populationIndicatorScene.Instantiate<Control>();
+                }
+                else
+                {
+                    indicator = playerSpeciesPopulationIndicators[i];
+                }
+
                 indicator.Position = position;
                 indicator.MouseFilter = MouseFilterEnum.Ignore;
-                indicator.UpdateIndicator(node);
-                node.AddChild(indicator);
 
-                indicator.ShowBehindParent = true;
+                var nodeModifier = node.Position.LengthSquared();
+                var modifierSinus = Mathf.Sin(i);
+
+                if (noCached)
+                {
+                    patchNodeContainer.AddChild(indicator);
+                }
+
+                playerSpeciesPopulationIndicators.Remove(indicator);
+
+                indicator.Position = node.Position + new Vector2(0, 20)
+                    .Rotated(nodeModifier * 30) + new Vector2(0, modifierSinus * 50).Rotated(
+                        i * 6 * modifierSinus + nodeModifier);
+
+                indicator.ZIndex = -1;
             }
         }
 

src/microbe_stage/editor/PatchMapDrawer.cs

@@ -1,23 +1,32 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://ui60hm6q35fb"]
 
-[ext_resource path="res://src/microbe_stage/editor/PatchMapDrawer.cs" type="Script" id=1]
-[ext_resource path="res://shaders/Monochrome.gdshader" type="Shader" id=2]
+[ext_resource type="Script" path="res://src/microbe_stage/editor/PatchMapDrawer.cs" id="1"]
+[ext_resource type="Shader" path="res://shaders/Monochrome.gdshader" id="2"]
 
-[sub_resource type="ShaderMaterial" id=1]
-shader = ExtResource( 2 )
+[sub_resource type="ShaderMaterial" id="1"]
+shader = ExtResource("2")
 
-[node name="PatchMapDrawer" type="Control"]
+[node name="PatchMapDrawer" type="Control" node_paths=PackedStringArray("populationIndicatorContainer")]
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-mouse_filter = 1
 size_flags_horizontal = 3
 size_flags_vertical = 3
-script = ExtResource( 1 )
+mouse_filter = 1
+script = ExtResource("1")
 DrawDefaultMapIfEmpty = true
 PatchNodeContainerPath = NodePath("PatchNodeContainer")
 LineContainerPath = NodePath("LineContainer")
-MonochromeMaterial = SubResource( 1 )
+MonochromeMaterial = SubResource("1")
+populationIndicatorContainer = NodePath("PopulationIndicatorContainer")
 
 [node name="LineContainer" type="Control" parent="."]
+anchors_preset = 0
 
 [node name="PatchNodeContainer" type="Control" parent="."]
+anchors_preset = 0
+
+[node name="PopulationIndicatorContainer" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0

src/microbe_stage/editor/PatchMapDrawer.tscn

@@ -1,19 +1,9 @@
-[gd_scene load_steps=3 format=3 uid="uid://d368temjpdpxv"]
+[gd_scene load_steps=2 format=3 uid="uid://d368temjpdpxv"]
 
-[ext_resource type="Script" path="res://src/microbe_stage/editor/PatchMapPopulationIndicator.cs" id="1_8o4yl"]
-[ext_resource type="Texture2D" uid="uid://cs4ewaw3baruk" path="res://assets/textures/gui/bevel/GrabClick.svg" id="1_r6jqg"]
+[ext_resource type="Texture2D" uid="uid://cbkfqk0lk6dhl" path="res://assets/textures/gui/bevel/MapDotIndicator.svg" id="2_15hpe"]
 
-[node name="PatchMapPopulationIndicator" type="Control" node_paths=PackedStringArray("indicator")]
-layout_mode = 3
-anchors_preset = 0
-offset_right = 64.0
-offset_bottom = 64.0
-script = ExtResource("1_8o4yl")
-indicator = NodePath("TextureRect")
-
-[node name="TextureRect" type="TextureRect" parent="."]
-layout_mode = 0
-offset_right = 10.0
-offset_bottom = 10.0
-texture = ExtResource("1_r6jqg")
+[node name="PatchMapPopulationIndicator" type="TextureRect"]
+offset_right = 6.0
+offset_bottom = 6.0
+texture = ExtResource("2_15hpe")
 expand_mode = 1