Changeset 151

Timestamp:

Nov 9, 2010, 10:37:40 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/osgVisualConfig.xml (modified) (2 diffs)
• include/distortion/visual_distortion.h (modified) (1 diff)
• include/util/visual_util.h (modified) (1 diff)
• src/core/visual_core.cpp (modified) (2 diffs)
• src/distortion/visual_distortion.cpp (modified) (7 diffs)
• src/util/visual_util.cpp (modified) (1 diff)

osgVisual/CMakeLists.txt

@@ -387 +387 @@
         SET(USERFILE_COMMAND_DEBUG "$(TargetPath)" CACHE STRING "Command to execute on debugging (VS Project settings)" )
         SET(USERFILE_WORKING_DIRECTORY_DEBUG "bin" CACHE STRING "Working directory on debugging (VS Project settings)" )
-        SET(USERFILE_COMMAND_ARGUMENTS_DEBUG "-C center --window 100 100 800 600 -m D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path --config osgVisualConfig.xml" CACHE STRING "Command arguments (VS Project settings)" )
+        SET(USERFILE_COMMAND_ARGUMENTS_DEBUG " --window 100 100 800 600 -m D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path --config osgVisualConfig.xml" CACHE STRING "Command arguments (VS Project settings)" )
         SET(USERFILE_REMOTE_MACHINE_DEBUG ${USER_NAME} CACHE STRING "Remote Debugging Machine (VS Project settings)")
         IF (DESTINATION_ARCH STREQUAL "x64")

osgVisual/bin/osgVisualConfig.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <osgvisualconfiguration>
-  <module name="distortion" enabled="yes">
+  <module name="distortion" enabled="no">
     <!-- XML configuration of the module "distortion"
       channelname = name of he channel, used to load the distortion- and blendmaps
@@ -17 +17 @@
   </module>
   <module name="sky_silverlining" enabled="yes"></module>
+  <module name="vista2d" enabled="yes">
+    <vista2d filename="hud.view"></vista2d>
+  </module>
   
   <scenery>

osgVisual/include/distortion/visual_distortion.h

@@ -87 +87 @@
          * @param subgraph : Undistorted scene graph.
          * @param clearColor : Clear color for distortion.
-         * @return : Group node which contains the distortion and the undistorted scene graph.
+         * @return : Group node which contains the distortion and the undistorted scene graph ( distortedGraph ).
          */ 
         osg::Group* initialize(osg::Group* subgraph, const osg::Vec4& clearColor );

osgVisual/include/util/visual_util.h

@@ -231 +231 @@
          *  xmlNode* yourNode = util::getModuleXMLConfig( configFilename, "core", tmpDoc );
          *  // use yourNode
-         *  if(tmpDoc)
+         *  if(yourNode)
          *  {
          *     xmlFreeDoc(tmpDoc); xmlCleanupParser();

osgVisual/src/core/visual_core.cpp

@@ -43 +43 @@
         }
 
-xmlDoc* tmpDoc;
-util::getModuleXMLConfig( configFilename, "core", tmpDoc );
-if(tmpDoc)
-{
-        xmlFreeDoc(tmpDoc); xmlCleanupParser();
-}
-
-
         // Configure osg to use KdTrees
         osgDB::Registry::instance()->setBuildKdTreesHint(osgDB::ReaderWriter::Options::BUILD_KDTREES);
@@ -79 +71 @@
 #ifdef USE_DISTORTION
         // Initialize distortion
-        OSG_NOTIFY( osg::ALWAYS ) << "Using distortion." << std::endl;
         distortion = new visual_distortion( viewer, arguments, configFilename );
-        distortion->initialize( rootNode, viewer->getCamera()->getClearColor() );
-        distortedSceneGraph = distortion->getDistortedSceneGraph();
+        distortedSceneGraph = distortion->initialize( rootNode, viewer->getCamera()->getClearColor() );
 #endif
 

osgVisual/src/distortion/visual_distortion.cpp

@@ -49 +49 @@
         if(config)
         {
-        
+                OSG_NOTIFY( osg::ALWAYS ) << "Using distortion." << std::endl;
+
                 xmlNode* a_node = config->children;
 
@@ -55 +56 @@
                 {
                         std::string node_name=reinterpret_cast<const char*>(cur_node->name);
-                        OSG_ALWAYS << "----visual_distortion::processXMLConfiguration() - node type="<< cur_node->type <<", name=" << cur_node->name << std::endl;
+                        //OSG_ALWAYS << "----visual_distortion::processXMLConfiguration() - node type="<< cur_node->type <<", name=" << cur_node->name << std::endl;
 
                         // Check for distortion node
@@ -68 +69 @@
                                         {
                                                 std::string  channelname = attr_value;
-                                                OSG_NOTIFY(osg::ALWAYS) << "channelname:" << channelname << std::endl;
+                                                OSG_NOTIFY(osg::ALWAYS) << "visual_distortion: Channelname:" << channelname << std::endl;
 
                                                 std::string pre_cfg("..\\resources\\distortion\\view_");
@@ -136 +137 @@
                                                 distortMapFileName = attr_value;
                                         }
-
                                         attr = attr->next; 
                                 }
@@ -153 +153 @@
                                                 blendMapFileName = attr_value;
                                         }
-
                                         attr = attr->next; 
                                 }
@@ -159 +158 @@
                 }       // FOR all nodes END
 
-
+                // clean up
+                xmlFreeDoc(tmpDoc); xmlCleanupParser();
+                return true;
         }       // IF Config valid END
         else
-                OSG_WARN << "ERROR: visual_distortion::processXMLConfiguration() - Invalid module configuration!" << std::endl;
-
-
-
-        // clean up
-        if(tmpDoc)
-        {
-                xmlFreeDoc(tmpDoc); xmlCleanupParser();
-                return true;
+        {
+                OSG_WARN << "WARNING: visual_distortion::processXMLConfiguration() - Module configuration not found or module disabled!" << std::endl;
+                return false;
         }
+
+
 
         return true;
@@ -191 +188 @@
 
         // Process XML configuration
-        processXMLConfiguration();
+        if(!processXMLConfiguration())
+                return NULL;    // Abort distortion initialization.
 
         // Add this node to the scenegraph to get updated during update traversal.

osgVisual/src/util/visual_util.cpp

@@ -146 +146 @@
                 if (cur_node->type == XML_ELEMENT_NODE)
                 {
-                        std::string node_name=reinterpret_cast<const char*>(cur_node->name);
-                        if (node_name == "module")
+                        // Extract Node Name and the first attribute: "module name"
+                        std::string node_name = reinterpret_cast<const char*>(cur_node->name);
+                        std::string modName = "";
+                        xmlAttr  *attr = 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 == "name" )
+                                        modName = attr_value;
+                                attr = attr->next;
+                        }
+                        
+                        // Check each node for the searched module
+                        if (node_name == "module" && modName == moduleName)
                         {
-                                OSG_DEBUG << "XML node module found" << std::endl;
-                                return cur_node;
+                                // Check if the module is active
+                                xmlAttr  *attr = 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 == "enabled" && attr_value == "yes" )
+                                        {
+                                                OSG_ALWAYS << "Found XML module configuration for " << moduleName << std::endl;
+                                                return cur_node;
+                                        }
+                                        if( attr_name == "enabled" && attr_value == "no" )
+                                        {
+                                                OSG_ALWAYS << "Found XML module configuration for " << moduleName << ", but it is DISABLED." << std::endl;
+                                                return NULL;
+                                        }
+                                        attr = attr->next;
+                                }
                         }
                         else    // Otherwise: check its children..