Changeset 144 for osgVisual/include

Timestamp:

Nov 1, 2010, 6:24:56 PM (14 years ago)

Author:

Torben Dannhauer

Message:

start to move osgVisual from argument based configuratiobn to xml file based configuration

Location:

osgVisual/include

Files:

• core/visual_core.h (modified) (1 diff)
• dataIO/visual_dataIO.h (modified) (1 diff)
• sky_Silverlining/visual_skySilverLining.h (modified) (1 diff)
• util/visual_util.h (modified) (4 diffs)

osgVisual/include/core/visual_core.h

@@ -139 +139 @@
 
         /**
-         * XML File valid?
+         * XML configuration filename.
          */
-        bool configFileValid;
+        std::string configFilename;
+
 
 #ifdef USE_SPACENAVIGATOR

osgVisual/include/dataIO/visual_dataIO.h

@@ -145 +145 @@
         static visual_dataIO* getInstance();
 
-        void init(osgViewer::Viewer* viewer_,osg::ArgumentParser& arguments_);
+        void init(osgViewer::Viewer* viewer_,osg::ArgumentParser& arguments_, std::string configFileName);
         void shutdown();
         bool isMaster(){if (clusterMode==osgVisual::dataIO_cluster::MASTER) return true; else return false;};

osgVisual/include/sky_Silverlining/visual_skySilverLining.h

@@ -65 +65 @@
          * @param viewer_ : Pointer to the applications viewer
          */ 
-        visual_skySilverLining(osgViewer::Viewer* viewer_);
+        visual_skySilverLining(osgViewer::Viewer* viewer_, std::string configFileName);
 
         /**

osgVisual/include/util/visual_util.h

@@ -18 +18 @@
 #include <string.h>
 #include <iostream>
-
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 #include <osg/Node>
@@ -27 +28 @@
 
 #include <osgViewer/Viewer>
+
+#include <OpenThreads/ReentrantMutex>
+
+#include <osgUtil/LineSegmentIntersector>
 
 #ifdef FUNFUNCTIONS_ENABLED
@@ -36 +41 @@
 #endif
 
-#include <OpenThreads/ReentrantMutex>
-
-#include <osgUtil/LineSegmentIntersector>
+
 
 namespace osgVisual
@@ -216 +219 @@
          */ 
         static bool setTransparentWindowBackground(osgViewer::Viewer* viewer_);
+
+        // Parses for the XML node of the specified module. The caller has to clean up if ret_value!=NULL, otherwise this function cleans up.
+        // nötige cleanup-Schritte:       xmlFreeDoc(doc); xmlCleanupParser();
+        static xmlNode* getModuleXMLConfig(std::string configFilename, std::string moduleName, xmlDoc*& doc);
+
+private: 
+        static xmlNode* checkXMLNodeChildrenForModule(xmlNode* node, std::string moduleName);
 };