Changeset 202

Timestamp:

Jan 21, 2011, 10:07:46 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

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

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -41 +41 @@
     <animationpath filename="salzburg.path"></animationpath>
     <models>
-      <model filename="cessna" type="plain" label="TestText!" dynamic="yes">
+      <model filename="cessna.osg" type="plain" label="TestText!" dynamic="yes">
         <position lat="47.12345" lon="11.234567" alt="1500.0"></position>
         <attitude rot_x="0.0" rot_y="0.0" rot_z="0.0"></attitude>
@@ -76 +76 @@
       </cloudlayer>-->
     </clouds>
-    <windlayer bottom="500.0" top="700." speed="25.0" direction="90.0"></windlayer>
+    <windlayer bottom="500.0" top="1100." speed="25.0" direction="90.0"></windlayer>
   </scenery>
 </osgvisualconfiguration>

osgVisual/trunk/include/object/visual_object.h

@@ -36 +36 @@
 #include <iostream>
 
+// XML Parser
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
 namespace osgVisual
 {
@@ -84 +89 @@
          */ 
         ~visual_object();
+
+        static visual_object* createNodeFromXMLConfig(osg::CoordinateSystemNode* sceneRoot_, xmlNode* a_node);
 
 

osgVisual/trunk/src/core/visual_core.cpp

@@ -279 +279 @@
                 if(cur_node->type == XML_ELEMENT_NODE && node_name == "models")
                 {
-                        /*
-                        <models>
-                          <model filename="cessna" type="plain" label="TestText!" dynamic="yes">
-                                <position lat="47.12345" lon="11.234567" alt="1500.0"></position>
-                                <attitude rot_x="0.0" rot_y="0.0" rot_z="0.0"></attitude>
-                                <cameraoffset>
-                                  <translation trans_x="0.0" trans_y="0.0" trans_z="0.0"></translation>
-                                  <rotation rot_x="0.0" rot_y="0.0" rot_z="0.0"></rotation>
-                                </cameraoffset>
-                          </model>
-                        </models>
-                        */
+                        for (xmlNode *modelNode = cur_node->children; modelNode; modelNode = modelNode->next)
+                        {
+                                visual_object::createNodeFromXMLConfig(rootNode, modelNode);
+                        }
                 }
 

osgVisual/trunk/src/object/visual_object.cpp

@@ -66 +66 @@
 }
 
+visual_object* visual_object::createNodeFromXMLConfig(osg::CoordinateSystemNode* sceneRoot_, xmlNode* a_node)
+{
+        //osg::ref<visual_object> object = new visual_object( root, nodeName);
+
+
+                        /*
+                        <models>
+                          <model filename="cessna" type="plain" label="TestText!" dynamic="yes">
+                                <position lat="47.12345" lon="11.234567" alt="1500.0"></position>
+                                <attitude rot_x="0.0" rot_y="0.0" rot_z="0.0"></attitude>
+                                <cameraoffset>
+                                  <translation trans_x="0.0" trans_y="0.0" trans_z="0.0"></translation>
+                                  <rotation rot_x="0.0" rot_y="0.0" rot_z="0.0"></rotation>
+                                </cameraoffset>
+                          </model>
+                        </models>
+                        */
+
+
+        return NULL;
+}
+
 void visual_object::setNewPositionAttitude( double lat_, double lon_, double alt_, double azimuthAngle_psi_, double pitchAngle_theta_, double bankAngle_phi_ )
 {