Changeset 227

Timestamp:

Feb 10, 2011, 12:51:47 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/object/visual_object.h (modified) (1 diff)
• src/core/visual_core.cpp (modified) (2 diffs)
• src/object/visual_object.cpp (modified) (2 diffs)

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -71 +71 @@
         </geometry>
       </model>
-      <trackmodel id="1" updater_slot=""></trackmodel> 
+      <trackmodel id="2" updater_slot=""></trackmodel> 
     </models>
     <datetime day="0" month="0" year="0" hour="12" minute="30"></datetime>

osgVisual/trunk/include/object/visual_object.h

@@ -77 +77 @@
         #include <leakDetection.h>
 public:
-        //META_Object(osgVisual,visual_object);
+        META_Node(osgVisual,visual_object);
+        visual_object() {};
+        visual_object(const osgVisual::visual_object& object_, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
+            MatrixTransform(object_,copyop),
+                        upVector(object_.upVector),
+                        lat(object_.lat),
+                        lon(object_.lon),
+                        alt(object_.alt),
+                        azimuthAngle_psi(object_.azimuthAngle_psi),
+                        pitchAngle_theta(object_.pitchAngle_theta),
+                        bankAngle_phi(object_.bankAngle_phi),
+                        scaleX(object_.scaleX),
+                        scaleY(object_.scaleY),
+                        scaleZ(object_.scaleZ),
+                        cameraMatrix(object_.cameraMatrix),
+                        cameraTranslationOffset(object_.cameraTranslationOffset),
+                        cameraRotationOffset(object_.cameraRotationOffset),
+                        geometry_offset_rotation(object_.geometry_offset_rotation),
+                        geometry(object_.geometry),
+                        updater(object_.updater),
+                        trackingId(object_.trackingId),
+                        labels(object_.labels)          
+                        {}
 
         /**

osgVisual/trunk/src/core/visual_core.cpp

@@ -282 +282 @@
                         {
                                 std::string name=reinterpret_cast<const char*>(modelNode->name);
-                                if(cur_node->type == XML_ELEMENT_NODE && name == "model")
+                                if(modelNode->type == XML_ELEMENT_NODE && name == "model")
                                 {
                                         visual_object::createNodeFromXMLConfig(rootNode, modelNode);
                                 }
-                                if(cur_node->type == XML_ELEMENT_NODE && name == "trackmodel")
+                                if(modelNode->type == XML_ELEMENT_NODE && name == "trackmodel")
                                 {
                                         // Extract track-ID and track the model
-                                        xmlAttr  *attr = cur_node->properties;
+                                        xmlAttr  *attr = modelNode->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) );
+                                                if( attr_name == "id" ) 
+                                                        trackNode( util::strToInt(attr_value) );
                                                 attr = attr->next; 
                                         }
@@ -464 +465 @@
         //testObj5->addUpdater( new object_updater(testObj5) );
 
-        trackNode( testObj4 );
+        //trackNode( testObj4 );
 
         // Load EDDF

osgVisual/trunk/src/object/visual_object.cpp

@@ -284 +284 @@
         object->pitchAngle_theta = rot_y;
         object->bankAngle_phi = rot_z;
+        object->trackingId = trackingID;
         if(label!="")
                 object->addLabel("default", label);
@@ -322 +323 @@
    // 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_;
-   }
+        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.