Renamed ExplosionDebriEffect to ExplosionDebrisEffect

src/osgParticle/ExplosionDebrisEffect.cpp

@@ -11,9 +11,7 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#include <osgParticle/ExplosionDebriEffect>
-
-#include <osgParticle/ExplosionDebriEffect>
+#include <osgParticle/ExplosionDebrisEffect>
 #include <osgParticle/ModularEmitter>
 #include <osgParticle/ModularProgram>
 #include <osgParticle/RandomRateCounter>
@@ -27,7 +25,7 @@
 
 using namespace osgParticle;
 
-ExplosionDebriEffect::ExplosionDebriEffect(const osg::Vec3& position, float scale, float intensity)
+ExplosionDebrisEffect::ExplosionDebrisEffect(const osg::Vec3& position, float scale, float intensity)
 {
     setDefaults();
     
@@ -41,12 +39,12 @@ ExplosionDebriEffect::ExplosionDebriEffect(const osg::Vec3& position, float scal
     buildEffect();
 }
 
-ExplosionDebriEffect::ExplosionDebriEffect(const ExplosionDebriEffect& copy, const osg::CopyOp& copyop):
+ExplosionDebrisEffect::ExplosionDebrisEffect(const ExplosionDebrisEffect& copy, const osg::CopyOp& copyop):
     ParticleEffect(copy,copyop)
 {
 }
 
-void ExplosionDebriEffect::setDefaults()
+void ExplosionDebrisEffect::setDefaults()
 {
     ParticleEffect::setDefaults();
     
@@ -64,7 +62,7 @@ void ExplosionDebriEffect::setDefaults()
 }
 
 
-void ExplosionDebriEffect::setUpEmitterAndProgram()
+void ExplosionDebrisEffect::setUpEmitterAndProgram()
 {
     // set up particle system
     if (!_particleSystem)

src/osgParticle/GNUmakefile

@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	Emitter.cpp\
 	ExplosionEffect.cpp\
-	ExplosionDebriEffect.cpp\
+	ExplosionDebrisEffect.cpp\
 	SmokeEffect.cpp\
 	FireEffect.cpp\
 	FluidFrictionOperator.cpp\

src/osgPlugins/osgParticle/GNUmakefile

@@ -26,7 +26,7 @@ CXXFILES =\
 	IO_SmokeEffect.cpp\
 	IO_FireEffect.cpp\
 	IO_ExplosionEffect.cpp\
-	IO_ExplosionDebriEffect.cpp\
+	IO_ExplosionDebrisEffect.cpp\
 	IO_VariableRateCounter.cpp\
 
 

src/osgPlugins/osgParticle/IO_ExplosionDebriEffect.cpp

@@ -1,28 +0,0 @@
-
-#include <osgParticle/ExplosionDebriEffect>
-
-#include <osgDB/Registry>
-#include <osgDB/Input>
-#include <osgDB/Output>
-
-bool  ExplosionDebriEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
-bool  ExplosionDebriEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);
-
-osgDB::RegisterDotOsgWrapperProxy  ExplosionDebriEffect_Proxy
-(
-    new osgParticle::ExplosionDebriEffect,
-    "ExplosionDebriEffect",
-    "Object Node ParticleEffect ExplosionDebriEffect",
-    ExplosionDebriEffect_readLocalData,
-    ExplosionDebriEffect_writeLocalData
-);
-
-bool ExplosionDebriEffect_readLocalData(osg::Object &, osgDB::Input &)
-{
-    return false;
-}
-
-bool ExplosionDebriEffect_writeLocalData(const osg::Object &, osgDB::Output &)
-{
-    return false;
-}

src/osgPlugins/osgParticle/IO_ExplosionDebrisEffect.cpp

@@ -0,0 +1,28 @@
+
+#include <osgParticle/ExplosionDebrisEffect>
+
+#include <osgDB/Registry>
+#include <osgDB/Input>
+#include <osgDB/Output>
+
+bool  ExplosionDebrisEffect_readLocalData(osg::Object &obj, osgDB::Input &fr);
+bool  ExplosionDebrisEffect_writeLocalData(const osg::Object &obj, osgDB::Output &fw);
+
+osgDB::RegisterDotOsgWrapperProxy  ExplosionDebrisEffect_Proxy
+(
+    new osgParticle::ExplosionDebrisEffect,
+    "ExplosionDebrisEffect",
+    "Object Node ParticleEffect ExplosionDebrisEffect",
+    ExplosionDebrisEffect_readLocalData,
+    ExplosionDebrisEffect_writeLocalData
+);
+
+bool ExplosionDebrisEffect_readLocalData(osg::Object &, osgDB::Input &)
+{
+    return false;
+}
+
+bool ExplosionDebrisEffect_writeLocalData(const osg::Object &, osgDB::Output &)
+{
+    return false;
+}

src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp

@@ -14,7 +14,7 @@
 #include <osg/Object>
 #include <osg/Vec3>
 #include <osgParticle/Emitter>
-#include <osgParticle/ExplosionDebriEffect>
+#include <osgParticle/ExplosionDebrisEffect>
 #include <osgParticle/Program>
 
 // Must undefine IN and OUT macros defined in Windows headers
@@ -25,10 +25,10 @@
 #undef OUT
 #endif
 
-BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebriEffect)
+BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebrisEffect)
 	I_BaseType(osgParticle::ParticleEffect);
 	I_ConstructorWithDefaults3(IN, const osg::Vec3 &, position, osg::Vec3(0.0f, 0.0f, 0.0f), IN, float, scale, 1.0f, IN, float, intensity, 1.0f);
-	I_ConstructorWithDefaults2(IN, const osgParticle::ExplosionDebriEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
+	I_ConstructorWithDefaults2(IN, const osgParticle::ExplosionDebrisEffect &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
 	I_Method0(osg::Object *, cloneType);
 	I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);
 	I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj);

src/osgWrappers/osgParticle/GNUmakefile

@@ -7,7 +7,7 @@ CXXFILES =\
 	CenteredPlacer.cpp\
 	Counter.cpp\
 	Emitter.cpp\
-	ExplosionDebriEffect.cpp\
+	ExplosionDebrisEffect.cpp\
 	ExplosionEffect.cpp\
 	FireEffect.cpp\
 	FluidFrictionOperator.cpp\