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

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

Author: delta
Date: 2005-02-18 17:01:35 -0800 (Fri, 18 Feb 2005)
New Revision: 1479

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Source/ObjectModel.cpp
Log:
* Fixed a bug with ContactMarkers.

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

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-18 16:04:22 UTC (rev 1478)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-19 01:01:35 UTC (rev 1479)
@@ -1,5 +1,9 @@
  Version 0.4.0 (in progress)
 ===========================
+
+2005-02-18: delta
+ * Fixed a bug with ContactMarkers.
+ 
 2005-02-17: lologramme
  * Added F16 D
 
@@ -11,7 +15,7 @@
    DrivenRotation::Callback operator.
 
 2005-02-15: lologramme
- * Addes Taxi signalisation
+ * Added Taxi signalisation
 
 2005-02-14: delta
  * Added Tools/Loader vs project.

Modified: trunk/CSP/CSPSim/Source/ObjectModel.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-02-18 16:04:22 UTC (rev 1478)
+++ trunk/CSP/CSPSim/Source/ObjectModel.cpp	2005-02-19 01:01:35 UTC (rev 1479)
@@ -84,7 +84,7 @@
 	simdata::Ref<Animation const> m_NestedAnimation;
 public:
 	AnimationBinding(Animation const* animation): m_Animation(animation) {}
-	inline AnimationCallback *bind(osg::Node *node) const {
+	AnimationCallback *bind(osg::Node *node) const {
 		return m_Animation->newCallback(node);
 	}
 	void setNestedAnimation(Animation const* animation) {
@@ -93,7 +93,7 @@
 	bool hasNestedAnimation() const {
 		return m_NestedAnimation.valid();
 	}
-	AnimationCallback* bindNested(osg::Node* node) const {
+	AnimationCallback *bindNested(osg::Node* node) const {
 		return m_NestedAnimation->newCallback(node->getUpdateCallback());
 	}
 };
@@ -150,6 +150,9 @@
 					CSP_LOG(APP, DEBUG, "FOUND 2nd");
 					animation_binding->setNestedAnimation(i->second.get());
 				}
+			} else {
+				// si id contient le nom d une TimedAnimationPath alors
+				// associer ce noeud a la TimedAnimationPath trouvee
 			}
 		}
 		traverse(node);
@@ -460,19 +463,19 @@
 		m_ContactMarkers->addChild(diamond);
 	}
 	// set markers not visible by default
-	m_ContactMarkers->setAllChildrenOff();
+	showContactMarkers(false);
 	m_DebugMarkers->addChild(m_ContactMarkers.get());
 }
 
 void ObjectModel::showContactMarkers(bool on) {
 	if (on)
+		m_ContactMarkers->setAllChildrenOn();
+	else
 		m_ContactMarkers->setAllChildrenOff();
-	else
-		m_ContactMarkers->setAllChildrenOn();
 }
 
 bool ObjectModel::getMarkersVisible() const {
-	return (m_ContactMarkers->getNodeMask() != 0x0);
+	return (m_ContactMarkers->getValue(0) != 0);
 }
 
 osg::ref_ptr<osg::Node> ObjectModel::getModel() {