Moved the IO support for the osgText and osgParticle libraries into seperate

plugin libraries.

src/osgDB/Registry.cpp

@@ -810,7 +810,19 @@ bool Registry::writeObject(const osg::Object& obj,Output& fw)
 
     std::string classname = obj.className();
     DotOsgWrapperMap::iterator itr = _classNameWrapperMap.find(classname);
-    if (itr!=_classNameWrapperMap.end())
+
+
+    if (itr==_classNameWrapperMap.end())
+    {
+        // first try the standard nodekit library.
+        std::string nodeKitLibraryName = createLibraryNameForNodeKit(obj.libraryName());
+        if (loadLibrary(nodeKitLibraryName)) return writeObject(obj,fw);
+
+        // otherwise try the osgdb_ plugin library.
+        std::string pluginLibraryName = createLibraryNameForExt(obj.libraryName());
+        if (loadLibrary(pluginLibraryName)) return writeObject(obj,fw);
+    }
+    else
     {
     
     
@@ -862,7 +874,7 @@ bool Registry::writeObject(const osg::Object& obj,Output& fw)
 
         return true;
     }
-
+    
     return false;
 }
 

src/osgParticle/Makefile

@@ -2,38 +2,17 @@ TOPDIR = ../..
 include $(TOPDIR)/Make/makedefs
 
 CXXFILES =\
-    Emitter.cpp\
-    FluidFrictionOperator.cpp\
-    IO_AccelOperator.cpp\
-    IO_CenteredPlacer.cpp\
-    IO_Emitter.cpp\
-    IO_FluidFrictionOperator.cpp\
-    IO_ForceOperator.cpp\
-    IO_LinearInterpolator.cpp\
-    IO_ModularEmitter.cpp\
-    IO_ModularProgram.cpp\
-    IO_MultiSegmentPlacer.cpp\
-    IO_Particle.cpp\
-    IO_ParticleProcessor.cpp\
-    IO_ParticleSystem.cpp\
-    IO_ParticleSystemUpdater.cpp\
-    IO_PointPlacer.cpp\
-    IO_Program.cpp\
-    IO_RadialShooter.cpp\
-    IO_RandomRateCounter.cpp\
-    IO_SectorPlacer.cpp\
-    IO_SegmentPlacer.cpp\
-    IO_VariableRateCounter.cpp\
-    ModularEmitter.cpp\
-    ModularProgram.cpp\
-    MultiSegmentPlacer.cpp\
-    Particle.cpp\
-    ParticleProcessor.cpp\
-    ParticleSystem.cpp\
-    ParticleSystemUpdater.cpp\
-    Program.cpp\
-    Version.cpp\
-
+	Emitter.cpp\
+	FluidFrictionOperator.cpp\
+	ModularEmitter.cpp\
+	ModularProgram.cpp\
+	MultiSegmentPlacer.cpp\
+	Particle.cpp\
+	ParticleProcessor.cpp\
+	ParticleSystem.cpp\
+	ParticleSystemUpdater.cpp\
+	Program.cpp\
+	Version.cpp\
 
 
 LIBS += -losg -losgDB -losgUtil $(GL_LIBS) $(OTHER_LIBS) $(DYNAMICLIBRARYLIB)

src/osgPlugins/osgParticle/Makefile

@@ -0,0 +1,33 @@
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 
+
+CXXFILES =\
+	IO_AccelOperator.cpp\
+	IO_CenteredPlacer.cpp\
+	IO_Emitter.cpp\
+	IO_FluidFrictionOperator.cpp\
+	IO_ForceOperator.cpp\
+	IO_LinearInterpolator.cpp\
+	IO_ModularEmitter.cpp\
+	IO_ModularProgram.cpp\
+	IO_MultiSegmentPlacer.cpp\
+	IO_Particle.cpp\
+	IO_ParticleProcessor.cpp\
+	IO_ParticleSystem.cpp\
+	IO_ParticleSystemUpdater.cpp\
+	IO_PointPlacer.cpp\
+	IO_Program.cpp\
+	IO_RadialShooter.cpp\
+	IO_RandomRateCounter.cpp\
+	IO_SectorPlacer.cpp\
+	IO_SegmentPlacer.cpp\
+	IO_VariableRateCounter.cpp\
+
+
+LIBS   += -losgParticle $(OSG_LIBS) $(OTHER_LIBS)
+
+TARGET_BASENAME = osgParticle
+include $(TOPDIR)/Make/cygwin_plugin_def
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)
+
+include $(TOPDIR)/Make/makerules 

src/osgPlugins/osgText/Makefile

@@ -0,0 +1,16 @@
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 
+
+CXXFILES =\
+	IO_Text.cpp \
+	IO_Font.cpp \
+	IO_Paragraph.cpp \
+
+
+LIBS   += -losgText $(OSG_LIBS) $(OTHER_LIBS)
+
+TARGET_BASENAME = osgText
+include $(TOPDIR)/Make/cygwin_plugin_def
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)
+
+include $(TOPDIR)/Make/makerules 

src/osgText/Makefile

@@ -23,9 +23,6 @@ CXXFILES =\
 	Font.cpp \
 	Paragraph.cpp \
 	Text.cpp \
-	IO_Text.cpp \
-	IO_Font.cpp \
-	IO_Paragraph.cpp \
 	Version.cpp