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

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

Author: delta
Date: 2005-05-04 05:07:26 -0700 (Wed, 04 May 2005)
New Revision: 1542

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/LandingGear.cpp
   trunk/CSP/CSPSim/Source/ObjectModel.cpp
Log:
* Replace 'remainder' by 'fmod'.
* Protect hud binding when no bus is defined (in 
  SceneModel::bindAnimationChannels).

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-05-04 06:37:37 UTC (rev 1541)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-05-04 12:07:26 UTC (rev 1542)
@@ -1,6 +1,12 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-05-04: delta
+ * Replace 'remainder' by 'fmod'.
+ 
+ * Protect hud binding when no bus is defined (in 
+   SceneModel::bindAnimationChannels).
+
 2005-05-03: onsight
  * Replace the object update message with a new format that provides
    much better support for animations.  Animations that need to be

Modified: trunk/CSP/CSPSim/Source/LandingGear.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/LandingGear.cpp	2005-05-04 06:37:37 UTC (rev 1541)
+++ trunk/CSP/CSPSim/Source/LandingGear.cpp	2005-05-04 12:07:26 UTC (rev 1542)
@@ -348,8 +348,8 @@
 void LandingGear::updateAnimation(double dt) {
 	if (m_GearAnimation.valid()) {
 		m_GearAnimation->update(dt);
-		m_GearAnimation->setCompression(m_Compression / m_CompressionLimit);
-		m_GearAnimation->setTireRotation(remainder(m_TireRotation, 2.0*simdata::PI));
+		m_GearAnimation->setCompression(m_Compression / m_CompressionLimit); 
+		m_GearAnimation->setTireRotation(fmod(m_TireRotation, 2.0*simdata::PI));
 		if (m_SteeringLimit > 0.0) {
 			m_GearAnimation->setSteeringAngle(toRadians(m_SteeringAngle));
 		}

Modified: trunk/CSP/CSPSim/Source/ObjectModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-05-04 06:37:37 UTC (rev 1541)
+++ trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-05-04 12:07:26 UTC (rev 1542)
@@ -747,22 +747,23 @@
 				CSP_LOG(OBJECT, ERROR, "bindAnimationChannels: animation channel '" << name << "' type not supported; skipping");
 			}
 		}
+	
+		// XXX Hack for testing
+		CSP_LOG(OBJECT, DEBUG, "Trying to bind HUD");
+		DataChannel<HUD*>::CRef hud_channel = bus->getChannel("HUD", false);
+		if (hud_channel.valid()) {
+			HUD *hud = hud_channel->value();
+			CSP_LOG(OBJECT, DEBUG, "Found HUD");
+			m_3dHud = hud->hud();
+			m_3dHud->setPosition(simdata::toOSG(m_Model->getHudPlacement()));
+			m_CenterOfMassOffset->addChild(hud->hud());
+			hud->setOrigin(simdata::toOSG(m_Model->getHudPlacement()));
+			hud->setViewPoint(simdata::toOSG(m_Model->getViewPoint()));
+			hud->setDimensions(m_Model->getHudWidth(), m_Model->getHudHeight());
+			CSP_LOG(OBJECT, DEBUG, "HUD added to model");
+		}
+		CSP_LOG(OBJECT, DEBUG, "bindAnimationChannels complete");
 	}
-	// XXX Hack for testing
-	CSP_LOG(OBJECT, DEBUG, "Trying to bind HUD");
-	DataChannel<HUD*>::CRef hud_channel = bus->getChannel("HUD", false);
-	if (hud_channel.valid()) {
-		HUD *hud = hud_channel->value();
-		CSP_LOG(OBJECT, DEBUG, "Found HUD");
-		m_3dHud = hud->hud();
-		m_3dHud->setPosition(simdata::toOSG(m_Model->getHudPlacement()));
-		m_CenterOfMassOffset->addChild(hud->hud());
-		hud->setOrigin(simdata::toOSG(m_Model->getHudPlacement()));
-		hud->setViewPoint(simdata::toOSG(m_Model->getViewPoint()));
-		hud->setDimensions(m_Model->getHudWidth(), m_Model->getHudHeight());
-		CSP_LOG(OBJECT, DEBUG, "HUD added to model");
-	}
-	CSP_LOG(OBJECT, DEBUG, "bindAnimationChannels complete");
 }
 
 void SceneModel::onViewMode(bool internal) {