FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed ExplosionDebriEffect to ExplosionDebrisEffect

Browse Source
This commit is contained in:
Robert Osfield 2005-05-25 16:42:36 +00:00
parent 2b08f729f3
commit 24849f3c70
13 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.txt
View File

@ -39,7 +39,7 @@ The osgTerrain library, for generating whole earth, geospecific paged databases,
Particle Effects: 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: DXF and Movie plugins:

4
VisualStudio/osgParticle/osgParticle.dsp
View File

@ -103,7 +103,7 @@ SOURCE=..\..\src\osgParticle\ExplosionEffect.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\osgParticle\ExplosionDebriEffect.cpp SOURCE=..\..\src\osgParticle\ExplosionDebrisEffect.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -191,7 +191,7 @@ SOURCE=..\..\include\osgParticle\ExplosionEffect
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\osgParticle\ExplosionDebriEffect SOURCE=..\..\include\osgParticle\ExplosionDebrisEffect
# End Source File # End Source File
# Begin Source File # Begin Source File

2
VisualStudio/osgPlugins/osgParticle/dot_osgParticle.dsp
View File

@ -148,7 +148,7 @@ SOURCE=..\..\..\src\osgPlugins\osgParticle\IO_ExplosionEffect.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\src\osgPlugins\osgParticle\IO_ExplosionDebriEffect.cpp SOURCE=..\..\..\src\osgPlugins\osgParticle\IO_ExplosionDebrisEffect.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

4
examples/osgcatch/osgcatch.cpp
View File

@ -30,7 +30,7 @@
#include <osg/io_utils> #include <osg/io_utils>
#include <osgParticle/ExplosionEffect> #include <osgParticle/ExplosionEffect>
#include <osgParticle/ExplosionDebriEffect> #include <osgParticle/ExplosionDebrisEffect>
#include <osgParticle/SmokeEffect> #include <osgParticle/SmokeEffect>
#include <osgParticle/FireEffect> #include <osgParticle/FireEffect>
@ -476,7 +476,7 @@ void CatchableObject::explode()
{ {
osg::Vec3 position(0.0f,0.0f,0.0f); osg::Vec3 position(0.0f,0.0f,0.0f);
osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, _radius); 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::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, _radius);
osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, _radius); osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, _radius);

8
examples/osgparticleeffects/osgparticleeffects.cpp
View File

@ -14,7 +14,7 @@
#include <osgText/Text> #include <osgText/Text>
#include <osgParticle/ExplosionEffect> #include <osgParticle/ExplosionEffect>
#include <osgParticle/ExplosionDebriEffect> #include <osgParticle/ExplosionDebrisEffect>
#include <osgParticle/SmokeEffect> #include <osgParticle/SmokeEffect>
#include <osgParticle/FireEffect> #include <osgParticle/FireEffect>
@ -183,7 +183,7 @@ void build_world(osg::Group *root)
osg::Vec3 position = computeTerrainIntersection(terrainGeode,100.0f,100.0f); osg::Vec3 position = computeTerrainIntersection(terrainGeode,100.0f,100.0f);
osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, 10.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::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, 10.0f);
osgParticle::FireEffect* fire = new osgParticle::FireEffect(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); osg::Vec3 position = computeTerrainIntersection(terrainGeode,200.0f,100.0f);
osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, 1.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::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, 1.0f);
osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, 1.0f); osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, 1.0f);
@ -275,7 +275,7 @@ public:
float intensity = handleMovingModels ? 5.0f : 1.0f; float intensity = handleMovingModels ? 5.0f : 1.0f;
osgParticle::ExplosionEffect* explosion = new osgParticle::ExplosionEffect(position, scale, intensity); 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::SmokeEffect* smoke = new osgParticle::SmokeEffect(position, scale, intensity);
osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, scale, intensity); osgParticle::FireEffect* fire = new osgParticle::FireEffect(position, scale, intensity);

12
include/osgParticle/ExplosionDebriEffect → include/osgParticle/ExplosionDebrisEffect
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details. * OpenSceneGraph Public License for more details.
*/ */
#ifndef OSGPARTICLE_EXPLOSIONDEBRIEFFECT #ifndef OSGPARTICLE_EXPLOSIONDEBRISEFFECT
#define OSGPARTICLE_EXPLOSIONDEBRIEFFECT #define OSGPARTICLE_EXPLOSIONDEBRISEFFECT
#include <osgParticle/ParticleEffect> #include <osgParticle/ParticleEffect>
#include <osgParticle/ModularEmitter> #include <osgParticle/ModularEmitter>
@ -21,15 +21,15 @@
namespace osgParticle namespace osgParticle
{ {
class OSGPARTICLE_EXPORT ExplosionDebriEffect : public ParticleEffect class OSGPARTICLE_EXPORT ExplosionDebrisEffect : public ParticleEffect
{ {
public: 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(); virtual void setDefaults();

12
src/osgParticle/ExplosionDebriEffect.cpp → src/osgParticle/ExplosionDebrisEffect.cpp
View File

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

2
src/osgParticle/GNUmakefile
View File

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

2
src/osgPlugins/osgParticle/GNUmakefile
View File

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

28
src/osgPlugins/osgParticle/IO_ExplosionDebriEffect.cpp
View File

@ -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;
}

28
src/osgPlugins/osgParticle/IO_ExplosionDebrisEffect.cpp Normal file
View File

@ -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;
}

6
src/osgWrappers/osgParticle/ExplosionDebriEffect.cpp → src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp
View File

@ -14,7 +14,7 @@
#include <osg/Object> #include <osg/Object>
#include <osg/Vec3> #include <osg/Vec3>
#include <osgParticle/Emitter> #include <osgParticle/Emitter>
#include <osgParticle/ExplosionDebriEffect> #include <osgParticle/ExplosionDebrisEffect>
#include <osgParticle/Program> #include <osgParticle/Program>
// Must undefine IN and OUT macros defined in Windows headers // Must undefine IN and OUT macros defined in Windows headers
@ -25,10 +25,10 @@
#undef OUT #undef OUT
#endif #endif
BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebriEffect) BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebrisEffect)
I_BaseType(osgParticle::ParticleEffect); 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_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_Method0(osg::Object *, cloneType);
I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);
I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj);

2
src/osgWrappers/osgParticle/GNUmakefile
View File

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