Changeset 151 for osgVisual/src/util/visual_util.cpp

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

File:

• osgVisual/src/util/visual_util.cpp (modified) (1 diff)

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..