Changeset 148

Timestamp:

Nov 7, 2010, 8:02:38 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/distortion/visual_distortion.h (modified) (3 diffs)
• src/core/visual_core.cpp (modified) (1 diff)
• src/distortion/visual_distortion.cpp (modified) (3 diffs)

osgVisual/bin/osgVisualConfig.xml

@@ -12 +12 @@
           window : renderImplementation = osg::Camera::SEPERATE_WINDOW
     -->
-    <distortion channelname="center" renderimplemmentation="fbo" hdr="yes">
-      <!-- optional: <distortionmap filename="distmap.png"></distortionmap> -->
-      <!-- optional: <blendmap filename="blendmap.png"></blendmap> -->
-  </distortion>
+    <distortion channelname="center" renderimplemmentation="fbo" width="2048" height="2048" useshader="yes" hdr="yes" usetexturerectangle="no">
+      <!-- optional: <distortionmap filename="distmap.png"></distortionmap> to set distortionmap independend from channel map-->
+      <!-- optional: <blendmap filename="blendmap.png"></blendmap> to set blendmap independend from channel map -->
+    </distortion>
   </module>
   <module name="sky_silverlining" enabled="yes"></module>

osgVisual/include/distortion/visual_distortion.h

@@ -33 +33 @@
 #include <osgGA/GUIActionAdapter>
 
+#include <visual_util.h>
+
 #include <string>
 #include <iostream>
 #include <fstream>
+
+// XML Parser
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 
@@ -68 +75 @@
         virtual ~visual_distortion(void);
 
+        bool processXMLConfiguration(); 
+
         /**
          * \brief This function parses the arguments for distortion relevant parameters.
@@ -469 +478 @@
 
         /**
+         * XML config filename
+         */ 
+        std::string configFileName;
+
+        /**
          * Target implementation which should be used to distort.
          */ 

osgVisual/src/core/visual_core.cpp

@@ -363 +363 @@
         // Pass the nodes to the corresponding modules...
         if(name == "core") this->config(a_node);
-
 }
 

osgVisual/src/distortion/visual_distortion.cpp

@@ -23 +23 @@
         OSG_NOTIFY (osg::ALWAYS ) << "visual_distortion instantiated." << std::endl;
 
+        this->configFileName = configFileName;
         initialized = false;
         distortionEnabled = false;
@@ -37 +38 @@
 {
         OSG_NOTIFY (osg::ALWAYS ) << "visual_distortion destroyed." << std::endl;
+}
+
+bool visual_distortion::processXMLConfiguration()
+{
+        // Init XML
+        xmlDoc* tmpDoc;
+        xmlNode* config = util::getModuleXMLConfig( configFileName, "distortion", tmpDoc );
+        if(config)
+        {
+                xmlNode* a_node = config;
+                // Extract infos
+                std::string name = "";
+                bool enabled = false;
+
+                xmlAttr  *attr = a_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 == "name" )
+                                name = reinterpret_cast<const char*>(attr->children->content);
+                        if( attr_name == "enabled" && attr_value== "yes" )
+                                enabled = true;
+                        if( attr_name == "enabled" && attr_value== "no" )
+                                enabled = false;
+
+                        attr = attr->next; 
+                } 
+                OSG_ALWAYS << "Module '" << name << "' found. Enabled = " << enabled << std::endl;
+        }
+
+        // extract configuration values
+
+        // clean up
+        if(tmpDoc)
+        {
+                xmlFreeDoc(tmpDoc); xmlCleanupParser();
+                return true;
+        }
+
+        return true;
 }
 
@@ -64 +106 @@
 
         // Read out Distortion CMDLine arguments
-        while (arguments.read("--width", tex_width)) {}
-    while (arguments.read("--height", tex_height)) {}
-
-        while (arguments.read("--fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; }
-    while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; }
-    while (arguments.read("--pbuffer-rtt")) { renderImplementation = osg::Camera::PIXEL_BUFFER_RTT; }
-    while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; }
-    while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPERATE_WINDOW; }
-
-    while (arguments.read("--texture-rectangle")) { useTextureRectangle = true; }
-
-    while (arguments.read("--shaderDistortion")) { useShaderDistortion = true; }
-
-    while (arguments.read("--hdr")) { useHDR = true; }
-
-        while (arguments.read("--distortionmap", distortMapFileName)) { }
-    while (arguments.read("--blendmap", blendMapFileName)) { }
+        //while (arguments.read("--width", tex_width)) {}
+    //while (arguments.read("--height", tex_height)) {}
+
+        //while (arguments.read("--fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; }
+        //while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; }
+        //while (arguments.read("--pbuffer-rtt")) { renderImplementation = osg::Camera::PIXEL_BUFFER_RTT; }
+        //while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; }
+        //while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPERATE_WINDOW; }
+
+    //while (arguments.read("--texture-rectangle")) { useTextureRectangle = true; }
+
+    //while (arguments.read("--shaderDistortion")) { useShaderDistortion = true; }
+
+    //while (arguments.read("--hdr")) { useHDR = true; }
+
+        //while (arguments.read("--distortionmap", distortMapFileName)) { }
+    //while (arguments.read("--blendmap", blendMapFileName)) { }
 
         std::string pre_cfg("..\\resources\\distortion\\view_");