friction and drift

OpenDreamProject · Feb 20, 2025 · de1ba9f · de1ba9f
1 parent 22c4f3d
commit de1ba9f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs b/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs
@@ -67,7 +67,7 @@ private ParticleSystemArgs GetParticleSystemArgs(DreamParticlesComponent compone
             };
         else
             result.Color = (float lifetime) => Color.White;
-        result.Acceleration = (float _ ) => GetGeneratorVector3(component.AccelerationLow, component.AccelerationHigh, component.AccelerationType)();
+        result.Acceleration = (float _ , Vector3 velocity) => GetGeneratorVector3(component.AccelerationLow, component.AccelerationHigh, component.AccelerationType)() + GetGeneratorVector3(component.DriftLow, component.DriftHigh, component.DriftType)() - velocity*GetGeneratorVector3(component.FrictionLow, component.FrictionHigh, component.FrictionType)();
         result.SpawnPosition = GetGeneratorVector3(component.SpawnPositionLow, component.SpawnPositionHigh, component.SpawnPositionType);
         result.SpawnVelocity = GetGeneratorVector3(component.SpawnVelocityLow, component.SpawnVelocityHigh, component.SpawnVelocityType);
         result.Transform = (float lifetime) => {

diff --git a/OpenDreamShared/Rendering/DreamParticlesComponent.cs b/OpenDreamShared/Rendering/DreamParticlesComponent.cs
@@ -5,8 +5,6 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Maths;
-using Robust.Shared.Serialization;
-using System;
 using Robust.Shared.ViewVariables;
 using Vector3 = Robust.Shared.Maths.Vector3;
 

diff --git a/RobustToolbox b/RobustToolbox
+1 −1		Robust.Client/GameObjects/EntitySystems/ClientDynamicParticlesSystem.cs
+1 −1		Robust.Client/Graphics/Particles/ParticleSystemArgs.cs
+4 −4		Robust.Client/Graphics/Particles/ParticlesManager.cs
+1 −1		Robust.Client/Graphics/Particles/ParticlesPrototype.cs