Changeset 186 for osgVisual/trunk/src/extLink

Timestamp:

Jan 8, 2011, 8:13:43 PM (14 years ago)

Author:

Torben Dannhauer

Message:

XML configuration now works also with dataIO extLink

Location:

osgVisual/trunk/src/extLink

Files:

• dataIO_extLinkDummy.cpp (modified) (1 diff)
• dataIO_extLinkVCL.cpp (modified) (2 diffs)

osgVisual/trunk/src/extLink/dataIO_extLinkDummy.cpp

@@ -32 +32 @@
 }
 
-void dataIO_extLinkDummy::init()
+bool dataIO_extLinkDummy::init(xmlNode* configurationNode)
 {
         OSG_NOTIFY( osg::ALWAYS ) << "extLinkDummy init()" << std::endl;
+        return true;
+}
+
+bool dataIO_extLinkDummy::processXMLConfiguration(xmlNode* extLinkConfig_)
+{
+        OSG_NOTIFY( osg::ALWAYS ) << "extLinkDummy processXMLConfiguration()" << std::endl;
+        return true;
 }
 

osgVisual/trunk/src/extLink/dataIO_extLinkVCL.cpp

@@ -31 +31 @@
 }
 
-void dataIO_extLinkVCL::init()
-{
+bool dataIO_extLinkVCL::init(xmlNode* configurationNode)
+{
+        if (!configurationNode || !processXMLConfiguration(configurationNode))
+                return false;
+
         OSG_NOTIFY( osg::ALWAYS ) << "extLinkVCL init()" << std::endl;
 
-        VCLConfigFilename = "osgVisual.xml";
-        
         if ( osgDB::fileExists( VCLConfigFilename ) )
         {
@@ -47 +48 @@
         else
         {
-                OSG_NOTIFY( osg::FATAL ) << "ERROR: Could not find VCL Configuration file " << VCLConfigFilename << std::endl;
-                exit(-1);
-        }
-
+                OSG_NOTIFY( osg::FATAL ) << "ERROR: Could not find VCL Configuration file '" << VCLConfigFilename << "', falling back to extLinkDummy" << std::endl;
+                return false;
+        }
+        return true;
+}
+
+bool dataIO_extLinkVCL::processXMLConfiguration(xmlNode* extLinkConfig_)
+{
+        // Extract VCL config file
+        xmlAttr  *attr = extLinkConfig_->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 == "implementation" )
+                {
+                        if(attr_value != "vcl")
+                        {
+                                OSG_NOTIFY( osg::ALWAYS ) << "WARNING: extLink configuration does not match the currently used 'vcl' implementation, falling back to extLinkDummy" << std::endl;
+                                return false;
+                        }
+                }
+                if( attr_name == "filename" )
+                {
+                        VCLConfigFilename = attr_value;
+                }
+                attr = attr->next; 
+        }       // WHILE attrib END
+
+        return true;
 }