[Csp-commits] svn:csp r1217 - in trunk/CSP/CSPSim: . Data Source

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

Author: delta
Date: 2004-08-24 10:59:41 -0700 (Tue, 24 Aug 2004)
New Revision: 1217

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/CSPSim.ini
   trunk/CSP/CSPSim/Source/LandingGear.cpp
Log:
Cosmetic changes.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-08-21 23:40:37 UTC (rev 1216)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-08-24 17:59:41 UTC (rev 1217)
@@ -1,6 +1,12 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2004-08-24: delta
+  * Used simdata::clampTo instead of std::min/max to avoid the usual 
+	macro conflict on vs. 
+  
+  * Avoid a minor warning with an implicit cats from double to float.
+
 2004-08-08: onsight
   * Clamp throttle to [0,1] when using keyboard controls (was [-1,1]).
 

Modified: trunk/CSP/CSPSim/Data/CSPSim.ini
===================================================================
--- trunk/CSP/CSPSim/Data/CSPSim.ini	2004-08-21 23:40:37 UTC (rev 1216)
+++ trunk/CSP/CSPSim/Data/CSPSim.ini	2004-08-24 17:59:41 UTC (rev 1217)
@@ -49,11 +49,10 @@
 ;Date = 2003-05-15 14:19:30
 
 [Networking]
-UseNetworking = true
+UseNetworking = false
 LocalMessagePort = 3150
 LocalMessageHost = 127.0.0.1
 RemoteMessagePort = 3160
 RemoteMessageHost = 127.0.0.1
 
 
-

Modified: trunk/CSP/CSPSim/Source/LandingGear.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/LandingGear.cpp	2004-08-21 23:40:37 UTC (rev 1216)
+++ trunk/CSP/CSPSim/Source/LandingGear.cpp	2004-08-24 17:59:41 UTC (rev 1217)
@@ -85,7 +85,7 @@
 	m_BrakeFriction = 1.0;
 	m_BrakeSlip = 0.8;
 	m_BrakeTemperature = 300.0;
-	m_RollingFriction.set(0.02, 0.002);
+	m_RollingFriction.set(0.02f, 0.002f);
 	m_TireFriction = 0.8;
 	m_TireSkidFriction = 0.6;
 	m_TireStaticFriction = 1.0;
@@ -175,7 +175,7 @@
 	// steering linkage (low pass filtered, XXX ad-hoc time constant)
 	double f = dt*5.0;
 	if (f > 1.0) f = 1.0;
-	double newBrake = std::min(1.0, std::max(0.0, m_BrakeSetting + m_BrakeSteer));
+	double newBrake = simdata::clampTo(m_BrakeSetting + m_BrakeSteer,0.0,1.0);
 	m_Brake = m_Brake * (1.0-f) + newBrake * f;
 	if (m_Brake < 0.0) m_Brake = 0.0;
 	if (m_Brake > 1.0) m_Brake = 1.0;