feat: Make particles respond to instantaneous wind speed and direction

Author: twpol

Source/RunActivity/Viewer3D/ParticleEmitter.cs

@@ -1,33 +1,31 @@
-// COPYRIGHT 2011, 2012, 2013, 2014 by the Open Rails project.
-// 
+// COPYRIGHT 2009 - 2023 by the Open Rails project.
+//
 // This file is part of Open Rails.
-// 
+//
 // Open Rails is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // Open Rails is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
-// This file is the responsibility of the 3D & Environment Team. 
+// This file is the responsibility of the 3D & Environment Team.
 
 // Enable this define to debug the inputs to the particle emitters from other parts of the program.
 //#define DEBUG_EMITTER_INPUT
 
+using System;
+using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Graphics.PackedVector;
-using Orts.Simulation.RollingStocks;
 using ORTS.Common;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using Orts.Simulation.RollingStocks;
 
 namespace Orts.Viewer3D
 {
@@ -211,9 +209,6 @@ struct ParticleVertex
 
         Viewer viewer;
         GraphicsDevice graphicsDevice;
-        
-        static float windDisplacementX;
-        static float windDisplacementZ;
 
         public ParticleEmitterPrimitive(Viewer viewer, ParticleEmitterData data, WorldPosition worldPosition)
         {
@@ -321,9 +316,6 @@ int GetCountFreeParticles()
 
         public void Update(float currentTime, ElapsedTime elapsedTime)
         {
-            windDisplacementX = viewer.Simulator.Weather.WindInstantaneousDirection.X * 0.25f;
-            windDisplacementZ = viewer.Simulator.Weather.WindInstantaneousDirection.Y * 0.25f;
-
             var velocity = WorldPosition.Location - LastWorldPosition.Location;
             velocity.X += (WorldPosition.TileX - LastWorldPosition.TileX) * 2048;
             velocity.Z += (WorldPosition.TileZ - LastWorldPosition.TileZ) * 2048;
@@ -369,15 +361,15 @@ public void Update(float currentTime, ElapsedTime elapsedTime)
                     initialVelocity.X += (float)(Viewer.Random.NextDouble() - 0.5f) * ParticleEmitterViewer.InitialSpreadRate;
                     initialVelocity.Z += (float)(Viewer.Random.NextDouble() - 0.5f) * ParticleEmitterViewer.InitialSpreadRate;
 
-                    // Target/final velocity vaies in X, Y and Z.
+                    // Target/final velocity varies in X, Y and Z.
                     var targetVelocity = globalTargetVelocity;
                     targetVelocity.X += Noise.Generate(time + PerlinStart[0]) * ParticleEmitterViewer.SpreadRate;
                     targetVelocity.Y += Noise.Generate(time + PerlinStart[1]) * ParticleEmitterViewer.SpreadRate;
                     targetVelocity.Z += Noise.Generate(time + PerlinStart[2]) * ParticleEmitterViewer.SpreadRate;
 
                     // Add wind speed
-                    targetVelocity.X += windDisplacementX;
-                    targetVelocity.Z += windDisplacementZ;
+                    targetVelocity.X += viewer.Simulator.Weather.WindInstantaneousSpeedMpS * viewer.Simulator.Weather.WindInstantaneousDirection.X;
+                    targetVelocity.Z += viewer.Simulator.Weather.WindInstantaneousSpeedMpS * viewer.Simulator.Weather.WindInstantaneousDirection.Y;
 
                     // ActionDuration is variable too.
                     var duration = ParticleDuration * (1 + Noise.Generate(time + PerlinStart[3]) * ParticleEmitterViewer.DurationVariation);