Changeset 208 for osgVisual/trunk

Timestamp:

Jan 27, 2011, 8:30:50 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• src/object/visual_object.cpp (modified) (4 diffs)

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -58 +58 @@
         <updater>
           <position lat="" lon="" alt=""></position>
-          <attitude rot_x="0.0" rot_y="0.0" rot_z="0.0"></attitude>
+          <attitude rot_x="" rot_y="" rot_z=""></attitude>
           <label text=""></label>
         </updater>

osgVisual/trunk/src/object/visual_object.cpp

@@ -81 +81 @@
         double geometry_scale_x=1.0, geometry_scale_y=1.0, geometry_scale_z=1.0;
         osg::ref_ptr<osgVisual::object_updater> updater = NULL;
+        std::string updater_lat="", updater_lon="", updater_alt="", updater_rot_x="", updater_rot_y="", updater_rot_z="", updater_label="";
 
         // extract model properties
@@ -155 +156 @@
                 }
 
-                //if(cur_node->type == XML_ELEMENT_NODE && node_name == "updater")
-                //{
-                //      for (xmlNode *sub_cur_node = cur_node->children; sub_cur_node; sub_cur_node = sub_cur_node->next)
-                //      {
-                //              std::string sub_node_name=reinterpret_cast<const char*>(cur_node->children->name);
-                //              if(sub_cur_node->type == XML_ELEMENT_NODE && sub_node_name == "position")
-                //              {
-                //                      <position lat="" lon="" alt=""></position>
-                //              }
-                //              if(sub_cur_node->type == XML_ELEMENT_NODE && sub_node_name == "attitude")
-                //              {
-                //                      <attitude rot_x="0.0" rot_y="0.0" rot_z="0.0"></attitude>
-                //              }
-                //              if(sub_cur_node->type == XML_ELEMENT_NODE && sub_node_name == "label")
-                //              {
-                //                      <label text=""></label>
-                //              }
-                //      }
-                //}
+                if(cur_node->type == XML_ELEMENT_NODE && node_name == "updater")
+                {
+                        for (xmlNode *sub_cur_node = cur_node->children; sub_cur_node; sub_cur_node = sub_cur_node->next)
+                        {
+                                std::string sub_node_name=reinterpret_cast<const char*>(cur_node->children->name);
+                                if(sub_cur_node->type == XML_ELEMENT_NODE && sub_node_name == "position")
+                                {
+                                        xmlAttr  *attr = sub_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 == "lat" )
+                                                        updater_lat = attr_value;
+                                                if( attr_name == "lon" )
+                                                        updater_lon = attr_value;
+                                                if( attr_name == "alt" ) 
+                                                        updater_alt = attr_value;
+                                                attr = attr->next; 
+                                        }
+                                }
+                                if(sub_cur_node->type == XML_ELEMENT_NODE && sub_node_name == "attitude")
+                                {
+                                        xmlAttr  *attr = sub_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 == "rot_x" )
+                                                        updater_rot_x = attr_value;
+                                                if( attr_name == "rot_y" )
+                                                        updater_rot_y = attr_value;
+                                                if( attr_name == "rot_z" ) 
+                                                        updater_rot_z = attr_value;
+                                                attr = attr->next; 
+                                        }
+                                }
+                                if(sub_cur_node->type == XML_ELEMENT_NODE && sub_node_name == "label")
+                                {
+                                        xmlAttr  *attr = sub_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 == "text" )
+                                                        updater_label = attr_value;
+                                                attr = attr->next; 
+                                        }
+                                }
+                        }
+                }
 
                 if(cur_node->type == XML_ELEMENT_NODE && node_name == "cameraoffset")
@@ -319 +352 @@
         {
                 updater = new osgVisual::object_updater(object);
+                object->addUpdater( updater );
         }
         object->setCameraOffset( cam_trans_x, cam_trans_y, cam_trans_z, cam_rot_x, cam_rot_y, cam_rot_z);
@@ -328 +362 @@
         }
 
-        if(updater.valid())
-                object->addUpdater( updater );  
-
-        /*
-        - updater [optional]: Channels to use for position and attitude update
-
-        <updater>
-          <translation-slots>todo</translation-slots>
-        </updater>
-    */
-
+        //if(updater.valid())
+        //{
+ //             object->addUpdater( updater );  
+        //      std::string updater_lat="", updater_lon="", updater_alt="", updater_rot_x="", updater_rot_y="", updater_rot_z="", updater_label="";
+        //}
+
+
+        
         OSG_NOTIFY( osg::ALWAYS ) << "Done." << std::endl;
         return object;