Changeset 11040

Timestamp:

02/04/10 11:20:17 (2 years ago)

Author:

robert

Message:

From Wang Rui, "I also did a small fix to the ObjectWrapper? header, to add a
OSGDB_EXPORT macro to RegisterCompressorProxy?, and modified the
findCompressor() method to look for custom compressors in libraries
such like osgdb_compressor_name.so, which was described in the wiki
page chapter 2.4."

Location:

OpenSceneGraph/trunk

Files:

• include/osgDB/ObjectWrapper (modified) (1 diff)
• src/osgDB/ObjectWrapper.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgDB/ObjectWrapper

@@ -140 +140 @@
     void wrapper_propfunc_##NAME(osgDB::ObjectWrapper* wrapper)
 
-class RegisterCompressorProxy
+class OSGDB_EXPORT RegisterCompressorProxy
 {
 public:

OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp

@@ -491 +491 @@
 
     // Load external libraries
-    std::string::size_type posDoubleColon = name.rfind("::");
-    if ( posDoubleColon!=std::string::npos )
-    {
-        std::string libName = std::string( name, 0, posDoubleColon );
-
-        std::string nodeKitLib = osgDB::Registry::instance()->createLibraryNameForNodeKit(libName);
-        if ( osgDB::Registry::instance()->loadLibrary(nodeKitLib)==osgDB::Registry::LOADED )
-            return findCompressor(name);
-
-        std::string pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(std::string("compressor_")+libName);
-        if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED )
-            return findCompressor(name);
-
-        pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(libName);
-        if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED )
-            return findCompressor(name);
-    }
+    std::string nodeKitLib = osgDB::Registry::instance()->createLibraryNameForNodeKit(name);
+    if ( osgDB::Registry::instance()->loadLibrary(nodeKitLib)==osgDB::Registry::LOADED )
+        return findCompressor(name);
+
+    std::string pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(std::string("compressor_")+name);
+    if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED )
+        return findCompressor(name);
+
+    pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(name);
+    if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED )
+        return findCompressor(name);
     return NULL;
 }