working!!!!

OpenDreamProject · Feb 20, 2025 · fb02985 · fb02985
1 parent 572791b
commit fb02985
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs b/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs
@@ -127,6 +127,7 @@ private ParticleSystemArgs GetParticleSystemArgs(DreamParticlesComponent compone
             return Matrix3x2.CreateScale(scale.X + growth.X, scale.Y + growth.Y) *
                 Matrix3x2.CreateRotation(rotation + spin);
         };
+        result.BaseTransform = Matrix3x2.Identity;
 
         return result;
     }

diff --git a/OpenDreamClient/Rendering/DreamViewOverlay.cs b/OpenDreamClient/Rendering/DreamViewOverlay.cs
@@ -461,10 +461,10 @@ public void DrawIcon(DrawingHandleWorld handle, Vector2i renderTargetSize, Rende
 
         if(iconMetaData.Particles is not null) {
             foreach(var particleSystem in iconMetaData.Particles){
-                handle.UseShader(GetBlendAndColorShader(iconMetaData, ignoreColor: true));
-                handle.SetTransform(CalculateDrawingMatrix(iconMetaData.TransformToApply, pixelPosition-particleSystem.RenderSize/2, particleSystem.RenderSize, renderTargetSize));
-                particleSystem.Draw(handle, pixelPosition);
+                var renderTarget = _renderTargetPool.Rent(particleSystem.RenderSize);
 
+                handle.UseShader(GetBlendAndColorShader(iconMetaData, ignoreColor: true));
+                particleSystem.Draw(handle, CalculateDrawingMatrix(iconMetaData.TransformToApply, pixelPosition, particleSystem.RenderSize, renderTargetSize));
             }
         }
         //if frame is null, this doesn't require a draw, so return NOP

diff --git a/OpenDreamShared/Rendering/DreamParticlesComponent.cs b/OpenDreamShared/Rendering/DreamParticlesComponent.cs
@@ -49,8 +49,8 @@ public sealed partial class DreamParticlesComponent : Component {
     [ViewVariables(VVAccess.ReadWrite)] public Vector3 FrictionLow;
     [ViewVariables(VVAccess.ReadWrite)] public ParticlePropertyType FrictionType;
 	//Scaling applied to the particles in (x,y)
-    [ViewVariables(VVAccess.ReadWrite)] public Vector2 ScaleHigh;
-    [ViewVariables(VVAccess.ReadWrite)] public Vector2 ScaleLow;
+    [ViewVariables(VVAccess.ReadWrite)] public Vector2 ScaleHigh = Vector2.One;
+    [ViewVariables(VVAccess.ReadWrite)] public Vector2 ScaleLow = Vector2.One;
     [ViewVariables(VVAccess.ReadWrite)] public ParticlePropertyType ScaleType;
 	//Rotation applied to the particles in degrees
     [ViewVariables(VVAccess.ReadWrite)] public float RotationHigh;

diff --git a/RobustToolbox b/RobustToolbox