particles now have different IDs

isadorasophia · Nov 25, 2023 · 93ccd02 · 93ccd02
1 parent f4ce5eb
commit 93ccd02
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Murder/Core/Particles/Data/EmitterShape.cs b/src/Murder/Core/Particles/Data/EmitterShape.cs
@@ -22,7 +22,7 @@ public Vector2 GetRandomPosition(Random random)
             {
                 case EmitterShapeKind.Point:
                     // Just return the central point
-                    return Vector2.Zero;
+                    return Vector2.Zero;    
 
                 case EmitterShapeKind.Line:
                     // Lerp between the start and the end of the line.

diff --git a/src/Murder/Core/Particles/ParticleSystemTracker.cs b/src/Murder/Core/Particles/ParticleSystemTracker.cs
@@ -56,13 +56,13 @@ public ParticleSystemTracker(Emitter emitter, Particle particle, int seed = 0)
         /// <param name="allowSpawn">Whether spawning new entities is allowed, e.g. the entity is not deactivated.</param>
         /// <param name="emitterPosition">Emitter position in game where the particles are fired from.</param>
         /// <returns>Returns whether the emitter is still running.</returns>
-        public bool Step(bool allowSpawn, Vector2 emitterPosition)
+        public bool Step(bool allowSpawn, Vector2 emitterPosition, int id)
         {
             _lastEmitterPosition = emitterPosition;
 
             if (!_hasStarted)
             {
-                Start(emitterPosition);
+                Start(emitterPosition, id);
             }
 
             float dt = Emitter.ScaledTime ? Game.DeltaTime : Game.UnscaledDeltaTime;
@@ -95,10 +95,10 @@ public bool Step(bool allowSpawn, Vector2 emitterPosition)
             return false;
         }
 
-        public void Start(Vector2 emitterPosition)
+        public void Start(Vector2 emitterPosition, int id)
         {
             _hasStarted = true;
-            _random = new Random((int)(_seed + emitterPosition.X + emitterPosition.Y / 320f));
+            _random = new Random((int)(_seed + emitterPosition.X + emitterPosition.Y / 320f) + id * 111);
 
             _time = _lastTimeSpawned = 0;
             _currentLength = Calculator.RoundToInt(Emitter.Burst.GetValue(_random));

diff --git a/src/Murder/Core/Particles/WorldParticleSystemTracker.cs b/src/Murder/Core/Particles/WorldParticleSystemTracker.cs
@@ -152,7 +152,7 @@ public void Step(World world)
             {
                 int entityId = _indexToEntityId[i];
                 Vector2 position = world.GetEntity(entityId).TryGetMurderTransform()?.GetGlobal()?.Vector2 ?? Vector2.Zero;
-                _poolTrackers[i].Step(_activeParticleSystems.Contains(entityId), position);
+                _poolTrackers[i].Step(_activeParticleSystems.Contains(entityId), position, entityId);
             }
         }