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

pointers in Particles object should be ref_ptr

Browse Source
This commit is contained in:
timoore 2008-08-11 08:32:13 +00:00
parent 74d3bdc68c
commit 29aad066f0
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/scene/model/particles.cxx
View File

@ -477,7 +477,7 @@ void Particles::operator()(osg::Node* node, osg::NodeVisitor* nv)
particleSys->getDefaultParticleTemplate().setSizeRange(osgParticle::rangef(startSize, endSize)); particleSys->getDefaultParticleTemplate().setSizeRange(osgParticle::rangef(startSize, endSize));
if (lifeValue) if (lifeValue)
particleSys->getDefaultParticleTemplate().setLifeTime(lifeValue->getValue()); particleSys->getDefaultParticleTemplate().setLifeTime(lifeValue->getValue());
if (program) { if (program.valid()) {
if (useGravity) if (useGravity)
program->setAcceleration(GlobalParticleCallback::getGravityVector()); program->setAcceleration(GlobalParticleCallback::getGravityVector());
if (useWind) if (useWind)

11
simgear/scene/model/particles.hxx
View File

@ -97,8 +97,6 @@ public:
endSizeValue(NULL), endSizeValue(NULL),
lifeValue(NULL), lifeValue(NULL),
counterCond(NULL), counterCond(NULL),
refFrame(NULL),
program(NULL),
useGravity(false), useGravity(false),
useWind(false) useWind(false)
{ {
@ -265,16 +263,15 @@ protected:
SGExpressiond* endSizeValue; SGExpressiond* endSizeValue;
SGExpressiond* lifeValue; SGExpressiond* lifeValue;
SGCondition* counterCond; SGCondition* counterCond;
osg::MatrixTransform* refFrame;
float staticColorComponents[8]; float staticColorComponents[8];
float startSize; float startSize;
float endSize; float endSize;
float counterStaticValue; float counterStaticValue;
float counterStaticExtraRange; float counterStaticExtraRange;
osgParticle::RadialShooter* shooter; osg::ref_ptr<osgParticle::RadialShooter> shooter;
osgParticle::RandomRateCounter* counter; osg::ref_ptr<osgParticle::RandomRateCounter> counter;
osgParticle::ParticleSystem* particleSys; osg::ref_ptr<osgParticle::ParticleSystem> particleSys;
osgParticle::FluidProgram* program; osg::ref_ptr<osgParticle::FluidProgram> program;
bool useGravity; bool useGravity;
bool useWind; bool useWind;
static osg::ref_ptr<osgParticle::ParticleSystemUpdater> psu; static osg::ref_ptr<osgParticle::ParticleSystemUpdater> psu;