[Csp-commits] svn:csp r1111 - trunk/CSP/CSPSim/Source

[<sv...@ww...>]

Author: delta
Date: 2004-06-29 04:10:48 -0700 (Tue, 29 Jun 2004)
New Revision: 1111

Modified:
   trunk/CSP/CSPSim/Source/Collision.cpp
Log:
min/max workaround.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1111

Modified: trunk/CSP/CSPSim/Source/Collision.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Collision.cpp	2004-06-29 11:10:02 UTC (rev 1110)
+++ trunk/CSP/CSPSim/Source/Collision.cpp	2004-06-29 11:10:48 UTC (rev 1111)
@@ -107,7 +107,7 @@
 			// normal spring force plus damping
 			double normalForce = depth * m_SpringConstant + m_ImpactDamping * impactSpeed;
 			// sanity check
-			normalForce = std::max(normalForce, 0.0);
+			normalForce = std::max<double>(normalForce, 0.0);
 			forceBody += normalForce * normalGroundBody;
 			// sliding frictional force
 			simdata::Vector3 slidingVelocityBody = contactVelocityBody + impactSpeed * normalGroundBody;
@@ -115,7 +115,7 @@
 			if (slidingSpeed > 0.0) {
 				// in principle we should have both sliding and static friction coefficients,
 				// but this is probably adequate for now.
-				double frictionLimit = std::max(0.1, m_Friction * normalForce);
+				double frictionLimit = std::max<double>(0.1, m_Friction * normalForce);
 				// i'd like to do damped spring extension relative to a fixed point when not
 				// sliding, but not sure if this will work with rk since dt doesn't accumulate
 				// monotonic time.