diff --git a/NEWS.txt b/NEWS.txt index b0c2024ac..ab504812b 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -39,7 +39,7 @@ The osgTerrain library, for generating whole earth, geospecific paged databases, Particle Effects: -To make it easier to add particle effects to your application a new osgParticle::ParticleEffects node has been written, with five concrete implementations of SmokeEffect, FireEffect, ExplosionEffect and ExplosionDebriEffect which you can create, adjust and add to your scene graphs. +To make it easier to add particle effects to your application a new osgParticle::ParticleEffects node has been written, with five concrete implementations of SmokeEffect, FireEffect, ExplosionEffect and ExplosionDebrisEffect which you can create, adjust and add to your scene graphs. DXF and Movie plugins: diff --git a/VisualStudio/osgParticle/osgParticle.dsp b/VisualStudio/osgParticle/osgParticle.dsp index 63a0159b8..bc6611e24 100644 --- a/VisualStudio/osgParticle/osgParticle.dsp +++ b/VisualStudio/osgParticle/osgParticle.dsp @@ -103,7 +103,7 @@ SOURCE=..\..\src\osgParticle\ExplosionEffect.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgParticle\ExplosionDebriEffect.cpp +SOURCE=..\..\src\osgParticle\ExplosionDebrisEffect.cpp # End Source File # Begin Source File @@ -191,7 +191,7 @@ SOURCE=..\..\include\osgParticle\ExplosionEffect # End Source File # Begin Source File -SOURCE=..\..\include\osgParticle\ExplosionDebriEffect +SOURCE=..\..\include\osgParticle\ExplosionDebrisEffect # End Source File # Begin Source File diff --git a/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp b/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp index 75f641993..e9df7368a 100644 --- a/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp +++ b/VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp @@ -148,7 +148,7 @@ SOURCE=..\..\..\src\osgPlugins\osgParticle\IO_ExplosionEffect.cpp # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\osgParticle\IO_ExplosionDebriEffect.cpp +SOURCE=..\..\..\src\osgPlugins\osgParticle\IO_ExplosionDebrisEffect.cpp # End Source File # Begin Source File diff --git a/examples/osgcatch/osgcatch.cpp b/examples/osgcatch/osgcatch.cpp index 75f7e74b4..ad4f0f7d6 100644 --- a/examples/osgcatch/osgcatch.cpp +++ b/examples/osgcatch/osgcatch.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include @@ -476,7 +476,7 @@ void CatchableObject::explode() { osg::Vec3 position(0.0f,0.0f,0.0f); osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, _radius); - osgParticle::ExplosionDebriEffect* explosionDebri = new osgParticle::ExplosionDebriEffect(position, _radius); + osgParticle::ExplosionDebrisEffect* explosionDebri = new osgParticle::ExplosionDebrisEffect(position, _radius); osgParticle::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, _radius); osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, _radius); diff --git a/examples/osgparticleeffects/osgparticleeffects.cpp b/examples/osgparticleeffects/osgparticleeffects.cpp index 9bd901137..2226e16dd 100644 --- a/examples/osgparticleeffects/osgparticleeffects.cpp +++ b/examples/osgparticleeffects/osgparticleeffects.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include @@ -183,7 +183,7 @@ void build_world(osg::Group *root) osg::Vec3 position = computeTerrainIntersection(terrainGeode,100.0f,100.0f); osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, 10.0f); - osgParticle::ExplosionDebriEffect* explosionDebri = new osgParticle::ExplosionDebriEffect(position, 10.0f); + osgParticle::ExplosionDebrisEffect* explosionDebri = new osgParticle::ExplosionDebrisEffect(position, 10.0f); osgParticle::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, 10.0f); osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, 10.0f); @@ -203,7 +203,7 @@ void build_world(osg::Group *root) osg::Vec3 position = computeTerrainIntersection(terrainGeode,200.0f,100.0f); osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, 1.0f); - osgParticle::ExplosionDebriEffect* explosionDebri = new osgParticle::ExplosionDebriEffect(position, 1.0f); + osgParticle::ExplosionDebrisEffect* explosionDebri = new osgParticle::ExplosionDebrisEffect(position, 1.0f); osgParticle::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, 1.0f); osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, 1.0f); @@ -275,7 +275,7 @@ public: float intensity = handleMovingModels ? 5.0f : 1.0f; osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, scale, intensity); - osgParticle::ExplosionDebriEffect* explosionDebri = new osgParticle::ExplosionDebriEffect(position, scale, intensity); + osgParticle::ExplosionDebrisEffect* explosionDebri = new osgParticle::ExplosionDebrisEffect(position, scale, intensity); osgParticle::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, scale, intensity); osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, scale, intensity); diff --git a/include/osgParticle/ExplosionDebriEffect b/include/osgParticle/ExplosionDebrisEffect similarity index 74% rename from include/osgParticle/ExplosionDebriEffect rename to include/osgParticle/ExplosionDebrisEffect index cb7ae59e4..38641d88f 100644 --- a/include/osgParticle/ExplosionDebriEffect +++ b/include/osgParticle/ExplosionDebrisEffect @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSGPARTICLE_EXPLOSIONDEBRIEFFECT -#define OSGPARTICLE_EXPLOSIONDEBRIEFFECT +#ifndef OSGPARTICLE_EXPLOSIONDEBRISEFFECT +#define OSGPARTICLE_EXPLOSIONDEBRISEFFECT #include #include @@ -21,15 +21,15 @@ namespace osgParticle { - class OSGPARTICLE_EXPORT ExplosionDebriEffect : public ParticleEffect + class OSGPARTICLE_EXPORT ExplosionDebrisEffect : public ParticleEffect { public: - ExplosionDebriEffect(const osg::Vec3& position=osg::Vec3(0.0f,0.0f,0.0f), float scale=1.0f, float intensity=1.0f); + ExplosionDebrisEffect(const osg::Vec3& position=osg::Vec3(0.0f,0.0f,0.0f), float scale=1.0f, float intensity=1.0f); - ExplosionDebriEffect(const ExplosionDebriEffect& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); + ExplosionDebrisEffect(const ExplosionDebrisEffect& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); - META_Node(osgParticle,ExplosionDebriEffect); + META_Node(osgParticle,ExplosionDebrisEffect); virtual void setDefaults(); diff --git a/src/osgParticle/ExplosionDebriEffect.cpp b/src/osgParticle/ExplosionDebrisEffect.cpp similarity index 92% rename from src/osgParticle/ExplosionDebriEffect.cpp rename to src/osgParticle/ExplosionDebrisEffect.cpp index a2273624c..94ce68199 100644 --- a/src/osgParticle/ExplosionDebriEffect.cpp +++ b/src/osgParticle/ExplosionDebrisEffect.cpp @@ -11,9 +11,7 @@ * OpenSceneGraph Public License for more details. */ -#include - -#include +#include #include #include #include @@ -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) diff --git a/src/osgParticle/GNUmakefile b/src/osgParticle/GNUmakefile index d03342fe9..527d8d6b9 100644 --- a/src/osgParticle/GNUmakefile +++ b/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\ diff --git a/src/osgPlugins/osgParticle/GNUmakefile b/src/osgPlugins/osgParticle/GNUmakefile index fc9f51ea8..4455cba71 100644 --- a/src/osgPlugins/osgParticle/GNUmakefile +++ b/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\ diff --git a/src/osgPlugins/osgParticle/IO_ExplosionDebriEffect.cpp b/src/osgPlugins/osgParticle/IO_ExplosionDebriEffect.cpp deleted file mode 100644 index de222fde2..000000000 --- a/src/osgPlugins/osgParticle/IO_ExplosionDebriEffect.cpp +++ /dev/null @@ -1,28 +0,0 @@ - -#include - -#include -#include -#include - -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; -} diff --git a/src/osgPlugins/osgParticle/IO_ExplosionDebrisEffect.cpp b/src/osgPlugins/osgParticle/IO_ExplosionDebrisEffect.cpp new file mode 100644 index 000000000..319b62302 --- /dev/null +++ b/src/osgPlugins/osgParticle/IO_ExplosionDebrisEffect.cpp @@ -0,0 +1,28 @@ + +#include + +#include +#include +#include + +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; +} diff --git a/src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp similarity index 89% rename from src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp rename to src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp index 656fbce7e..562c90e1c 100644 --- a/src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include // 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); diff --git a/src/osgWrappers/osgParticle/GNUmakefile b/src/osgWrappers/osgParticle/GNUmakefile index 512fe197f..4e2d85cb7 100644 --- a/src/osgWrappers/osgParticle/GNUmakefile +++ b/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\