Feature/26 uniform scale for particles

examples/EmberExample/.config/dotnet-tools.json

@@ -3,34 +3,34 @@
   "isRoot": true,
   "tools": {
     "dotnet-mgcb": {
-      "version": "3.8.4",
+      "version": "3.8.4.1",
       "commands": [
         "mgcb"
       ]
     },
     "dotnet-mgcb-editor": {
-      "version": "3.8.4",
+      "version": "3.8.4.1",
       "commands": [
         "mgcb-editor"
       ]
     },
     "dotnet-mgcb-editor-linux": {
-      "version": "3.8.4",
+      "version": "3.8.4.1",
       "commands": [
         "mgcb-editor-linux"
       ]
     },
     "dotnet-mgcb-editor-windows": {
-      "version": "3.8.4",
+      "version": "3.8.4.1",
       "commands": [
         "mgcb-editor-windows"
       ]
     },
     "dotnet-mgcb-editor-mac": {
-      "version": "3.8.4",
+      "version": "3.8.4.1",
       "commands": [
         "mgcb-editor-mac"
       ]
     }
   }
-}
+}

examples/EmberExample/Content/Content.mgcb

@@ -10,6 +10,7 @@
 
 #-------------------------------- References --------------------------------#
 
+/reference:..\..\..\external\monogame-extended\.artifacts\source\bin\MonoGame.Extended.Content.Pipeline\release\MonoGame.Extended.Content.Pipeline.dll
 
 #---------------------------------- Content ---------------------------------#
 
@@ -20,7 +21,9 @@
 /copy:loadtest/Pixel.png
 
 #begin ring/ring.ember
-/copy:ring/ring.ember
+/importer:
+/processor:
+/build:ring/ring.ember
 
 #begin ring/Ring.png
 /copy:ring/Ring.png
@@ -36,3 +39,4 @@
 
 #begin spark/spark.ember
 /copy:spark/spark.ember
+

examples/EmberExample/EmberExample.csproj

@@ -25,8 +25,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Hexa.NET.ImGui" Version="2.2.8.5" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.*" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.*" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4.1" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\external\monogame-extended\source\MonoGame.Extended\MonoGame.Extended.csproj" />

examples/EmberExample/Game1.cs

@@ -127,8 +127,7 @@ private void DrawDebugWindow(GameTime gameTime)
                 ImGui.TableNextColumn();
                 if (ImGui.Button("Ring"u8, new System.Numerics.Vector2(-1, 0)))
                 {
-                    string fileName = Path.Combine(_contentPath, "ring", "ring.ember");
-                    LoadParticleEffect(fileName);
+                    LoadParticleEffect("ring/ring", true);
                 }
 
                 ImGui.TableNextColumn();
@@ -156,7 +155,7 @@ private void DrawDebugWindow(GameTime gameTime)
                 ImGui.Text("Auto Trigger: ");
                 ImGui.TableNextColumn();
                 bool autoTrigger = _particleEffect.AutoTrigger;
-                if(ImGui.Checkbox("##auto_trigger"u8, ref autoTrigger))
+                if (ImGui.Checkbox("##auto_trigger"u8, ref autoTrigger))
                 {
                     _particleEffect.AutoTrigger = autoTrigger;
                 }
@@ -213,17 +212,24 @@ private void DrawDebugWindow(GameTime gameTime)
         ImGuiRenderer.AfterLayout();
     }
 
-    private void LoadParticleEffect(string fileName)
+    private void LoadParticleEffect(string fileName, bool useContentPipeline = false)
     {
         if (_particleEffect != null)
         {
             _particleEffect.Dispose();
             _particleEffect = null;
         }
 
-        using ParticleEffectReader reader = new(fileName, Content);
-        _particleEffect = reader.ReadParticleEffect();
-        _particleEffect.Position = GraphicsDevice.Viewport.Bounds.Center.ToVector2();
-        _particleEffect.AutoTrigger = false;
+        if (useContentPipeline)
+        {
+            _particleEffect = Content.Load<ParticleEffect>(fileName);
+        }
+        else
+        {
+            using ParticleEffectReader reader = new(fileName, Content);
+            _particleEffect = reader.ReadParticleEffect();
+            _particleEffect.Position = GraphicsDevice.Viewport.Bounds.Center.ToVector2();
+            _particleEffect.AutoTrigger = false;
+        }
     }
 }

src/Ember/Architecture/Components/PropertyTable.cs

@@ -471,10 +471,37 @@ public static bool ReleaseParameter(ReadOnlySpan<byte> label, ReadOnlySpan<byte>
         }
         else if (value.Kind == ParticleValueKind.Random)
         {
-            if (ReleaseParameterRandomVector2(ref value.RandomMin, ref value.RandomMax))
+            TableNextColumn();
+            bool uniform = value.Uniform;
+            if (Checkbox("Uniform##uniform"u8, ref uniform))
             {
+                value.Uniform = uniform;
+                if (uniform)
+                {
+                    value.RandomMin.Y = value.RandomMin.X;
+                    value.RandomMax.Y = value.RandomMax.X;
+                }
                 changed = true;
             }
+
+            TableNextRow();
+            TableNextColumn();
+            TableNextColumn();
+
+            if (value.Uniform)
+            {
+                if (ReleaseParameterUniformRandomVector2(ref value.RandomMin, ref value.RandomMax))
+                {
+                    changed = true;
+                }
+            }
+            else
+            {
+                if (ReleaseParameterRandomVector2(ref value.RandomMin, ref value.RandomMax))
+                {
+                    changed = true;
+                }
+            }
         }
 
         PopID();
@@ -657,6 +684,43 @@ private static bool ReleaseParameterConstantVector2(ref XnaVec2 value)
         return changed;
     }
 
+    private static bool ReleaseParameterUniformRandomVector2(ref XnaVec2 min, ref XnaVec2 max)
+    {
+        bool changed = false;
+
+        ImGuiStylePtr stylePtr = GetStyle();
+        TableNextColumn();
+
+        float availWidth = GetContentRegionAvail().X;
+        float toWidth = CalcTextSize(" to "u8).X;
+        float spacing = stylePtr.ItemSpacing.X * 2.0f;
+        float dragWidth = (availWidth - toWidth - spacing) * 0.5f;
+
+        SetNextItemWidth(dragWidth);
+        float minVal = min.X;
+        if (DragFloat("##uniform-min"u8, ref minVal, 0.1f, 0.0f, max.X, "%.2f"u8))
+        {
+            min.X = minVal;
+            min.Y = minVal;
+            changed = true;
+        }
+
+        SameLine();
+        Text(" to "u8);
+
+        SameLine();
+        SetNextItemWidth(dragWidth);
+        float maxVal = max.X;
+        if (DragFloat("##uniform-max"u8, ref maxVal, 0.1f, min.X, float.MaxValue, "%.2f"u8))
+        {
+            max.X = maxVal;
+            max.Y = maxVal;
+            changed = true;
+        }
+
+        return changed;
+    }
+
     private static bool ReleaseParameterRandomVector2(ref XnaVec2 min, ref XnaVec2 max)
     {
         bool changed = false;