Changeset 10976 for OpenSceneGraph/trunk/include/osgDB/Registry

Timestamp:

01/20/10 21:13:33 (3 years ago)

Author:

robert

Message:

From Wang Rui, new native binary/ascii format infrastructure and wrappers.

From Robert Osfield, refactor of Wang Rui's original osg2 into 3 parts - parts placed into osgDB, the ReaderWriter? placed into src/osg/Plugin/osg and wrappers into src/osgWrappers/serializers/osg

Files:

• OpenSceneGraph/trunk/include/osgDB/Registry (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgDB/Registry

@@ -622 +622 @@
 }
 
-/**  Proxy class for automatic registration of DotOsgWrappers with the Registry.*/
-class RegisterDotOsgWrapperProxy
-{
-    public:
-    
-        RegisterDotOsgWrapperProxy(osg::Object* proto,
-                                   const std::string& name,
-                                   const std::string& associates,
-                                   DotOsgWrapper::ReadFunc readFunc,
-                                   DotOsgWrapper::WriteFunc writeFunc,
-                                   DotOsgWrapper::ReadWriteMode readWriteMode=DotOsgWrapper::READ_AND_WRITE)
-        {
-            if (Registry::instance())
-            {
-                _wrapper = new DotOsgWrapper(proto,name,associates,readFunc,writeFunc,readWriteMode);
-                Registry::instance()->addDotOsgWrapper(_wrapper.get());
-            }
-        }
-        
-        ~RegisterDotOsgWrapperProxy()
-        {
-            if (Registry::instance())
-            {
-                Registry::instance()->removeDotOsgWrapper(_wrapper.get());
-            }
-        }
-        
-    protected:
-        osg::ref_ptr<DotOsgWrapper> _wrapper;
-};
-
-template<class T>
-class TemplateRegisterDotOsgWrapperProxy : public RegisterDotOsgWrapperProxy, public T
-{
-    public:
-    
-        TemplateRegisterDotOsgWrapperProxy(osg::Object* proto,
-                                   const std::string& name,
-                                   const std::string& associates,
-                                   DotOsgWrapper::ReadFunc readFunc,
-                                   DotOsgWrapper::WriteFunc writeFunc,
-                                   DotOsgWrapper::ReadWriteMode readWriteMode=DotOsgWrapper::READ_AND_WRITE):
-            RegisterDotOsgWrapperProxy(proto, name, associates, readFunc, writeFunc, readWriteMode) {}
-        
-};
-
 /** Proxy class for automatic registration of reader/writers with the Registry.*/
 template<class T>
@@ -706 +660 @@
     static osgDB::PluginFunctionProxy proxy_##ext(osgdb_##ext);
 
+#define USE_DOTOSGWRAPPER(classname) \
+    extern "C" void dotosgwrapper_##classname(void); \
+    static osgDB::PluginFunctionProxy proxy_dotosgwrapper_##classname(dotosgwrapper_##classname);
+
 #define REGISTER_OSGPLUGIN(ext, classname) \
     extern "C" void osgdb_##ext(void) {} \
@@ -711 +669 @@
 
 
-#define USE_DOTOSGWRAPPER(classname) \
-    extern "C" void dotosgwrapper_##classname(void); \
-    static osgDB::PluginFunctionProxy proxy_dotosgwrapper_##classname(dotosgwrapper_##classname);
-
-#define REGISTER_DOTOSGWRAPPER(classname) \
-    extern "C" void dotosgwrapper_##classname(void) {} \
-    static osgDB::RegisterDotOsgWrapperProxy dotosgwrapper_proxy_##classname
-
 }