Changeset 226

Timestamp:

Feb 10, 2011, 11:49:39 AM (14 years ago)

Author:

Torben Dannhauer

Message:

TRacking nodes by XML config should work now

Location:

osgVisual/trunk

Files:

• include/object/visual_object.h (modified) (2 diffs)
• include/util/visual_util.h (modified) (1 diff)
• src/core/visual_core.cpp (modified) (2 diffs)
• src/object/visual_object.cpp (modified) (1 diff)
• src/util/visual_util.cpp (modified) (1 diff)

osgVisual/trunk/include/object/visual_object.h

@@ -77 +77 @@
         #include <leakDetection.h>
 public:
+        //META_Object(osgVisual,visual_object);
+
         /**
          * \brief Constuctor: Adds this object to the scenegraph,
@@ -93 +95 @@
 
         static visual_object* createNodeFromXMLConfig(osg::CoordinateSystemNode* sceneRoot_, xmlNode* a_node);
+
+        /**
+         * \brief This functions searches in the scene graph for a node with a tracking ID
+         * 
+         * @param trackingID : Id to search for.
+         * @param currNode_ : Scene graph to search in.
+         * @return : Pointer to the first found node, otherwise NULL.
+         */ 
+        static osg::Node* findNodeByTrackingID(int trackingID, osg::Node* currNode_);
 
 

osgVisual/trunk/include/util/visual_util.h

@@ -34 +34 @@
 #include <osgUtil/LineSegmentIntersector>
 
+
+
 #ifdef FUNFUNCTIONS_ENABLED
 #ifdef WIN32

osgVisual/trunk/src/core/visual_core.cpp

@@ -288 +288 @@
                                 if(cur_node->type == XML_ELEMENT_NODE && name == "trackmodel")
                                 {
-                                        // Extract model to track
-
-                                        trackNode( testObj4 );
+                                        // Extract track-ID and track the model
+                                        xmlAttr  *attr = cur_node->properties;
+                                        while ( attr ) 
+                                        { 
+                                                std::string attr_name=reinterpret_cast<const char*>(attr->name);
+                                                std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
+                                                if( attr_name == "id" ) trackNode( util::strToInt(attr_value) );
+                                                attr = attr->next; 
+                                        }
+                                        
                                 }
                         }
@@ -543 +550 @@
 void visual_core::trackNode( int trackingID )
 {
-        osg::Node tmp = util::findNodeByTrackingID(trackingID);
+        osg::ref_ptr<osg::Node> tmp = visual_object::findNodeByTrackingID(trackingID, rootNode);
         if(tmp.valid())
                 trackNode(tmp);

osgVisual/trunk/src/object/visual_object.cpp

@@ -308 +308 @@
 }
 
+osg::Node* visual_object::findNodeByTrackingID(int trackingID, osg::Node* currNode_)
+{
+        osg::Group* currGroup;
+   osg::Node* foundNode;
+
+   // check to see if we have a valid (non-NULL) node.
+   // if we do have a null node, return NULL.
+   if ( !currNode_)
+   {
+      return NULL;
+   }
+
+   // We have a valid node, check to see if this is the node we 
+   // are looking for. If so, return the current node.
+   if (currNode_->className() == "visual_object")
+   {
+           //Check if it is the right tracking Id
+                osgVisual::visual_object* tmp = dynamic_cast<osgVisual::visual_object*>(currNode_);
+                if(tmp && tmp->getTrackingId()==trackingID)
+                        return currNode_;
+   }
+
+   // We have a valid node, but not the one we are looking for.
+   // Check to see if it has children (non-leaf node). If the node
+   // has children, check each of the child nodes by recursive call.
+   // If one of the recursive calls returns a non-null value we have
+   // found the correct node, so return this node.
+   // If we check all of the children and have not found the node,
+   // return NULL
+   currGroup = currNode_->asGroup(); // returns NULL if not a group.
+   if ( currGroup ) 
+   {
+      for (unsigned int i = 0 ; i < currGroup->getNumChildren(); i ++)
+      { 
+         foundNode = findNodeByTrackingID( trackingID, currGroup->getChild(i));
+         if (foundNode)
+                 {
+                         std::cout << "Node gefunden in Ebene: " << i << std::endl;
+            return foundNode; // found a match!
+                }
+      }
+      return NULL; // We have checked each child node - no match found.
+   }
+   else 
+      return NULL; // leaf node, no match 
+}
+
 void visual_object::setNewPositionAttitude( double lat_, double lon_, double alt_, double azimuthAngle_psi_, double pitchAngle_theta_, double bankAngle_phi_ )
 {

osgVisual/trunk/src/util/visual_util.cpp

@@ -237 +237 @@
    }
    else 
-   {
-      return NULL; // leaf node, no match 
-   }
+           return NULL; // leaf node, no match 
 }