Velocity limit, to prevent NaNs

The-Powder-Toy · Mar 27, 2014 · 20cbcf8 · 20cbcf8
1 parent 2e6b424
commit 20cbcf8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Config.h b/src/Config.h
@@ -130,6 +130,7 @@
 #define CELL	4
 #define ISTP	(CELL/2)
 #define CFDS	(4.0f/CELL)
+#define SIM_MAXVELOCITY 1e4f
 
 //Air constants
 #define AIR_TSTEPP 0.3f

diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
@@ -4199,6 +4199,12 @@ void Simulation::update_particles_i(int start, int inc)
 			}
 			else
 			{
+				if (mv > SIM_MAXVELOCITY)
+				{
+					parts[i].vx *= SIM_MAXVELOCITY/mv;
+					parts[i].vy *= SIM_MAXVELOCITY/mv;
+					mv = SIM_MAXVELOCITY;
+				}
 				// interpolate to see if there is anything in the way
 				dx = parts[i].vx*ISTP/mv;
 				dy = parts[i].vy*ISTP/mv;