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

No need to deal with OSG versions pre 3.0

Browse Source
This commit is contained in:
James Turner 2013-07-29 22:53:31 +01:00
parent 05f266ac10
commit ee403fd83a
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,10 +44,6 @@
#include "particles.hxx" #include "particles.hxx"
#if SG_OSG_VERSION >= 27004
#define OSG_PARTICLE_FIX 1
#endif
namespace simgear namespace simgear
{ {
void GlobalParticleCallback::operator()(osg::Node* node, osg::NodeVisitor* nv) void GlobalParticleCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
@ -192,19 +188,12 @@ osg::Group * Particles::appendParticles(const SGPropertyNode* configNode,
osg::Geode* g = new osg::Geode; osg::Geode* g = new osg::Geode;
align->addChild(g); align->addChild(g);
g->addDrawable(particleSys); g->addDrawable(particleSys);
#ifndef OSG_PARTICLE_FIX
emitter->setReferenceFrame(osgParticle::Emitter::ABSOLUTE_RF);
#endif
} else { } else {
#ifdef OSG_PARTICLE_FIX
callback()->particleFrame = new osg::MatrixTransform(); callback()->particleFrame = new osg::MatrixTransform();
osg::Geode* g = new osg::Geode; osg::Geode* g = new osg::Geode;
g->addDrawable(particleSys); g->addDrawable(particleSys);
callback()->particleFrame->addChild(g); callback()->particleFrame->addChild(g);
getCommonRoot()->addChild(callback()->particleFrame.get()); getCommonRoot()->addChild(callback()->particleFrame.get());
#else
getCommonGeode()->addDrawable(particleSys);
#endif
} }
std::string textureFile; std::string textureFile;
if (configNode->hasValue("texture")) { if (configNode->hasValue("texture")) {
@ -477,14 +466,7 @@ osg::Group * Particles::appendParticles(const SGPropertyNode* configNode,
program->setFluidToWater(); program->setFluidToWater();
if (programnode->getBoolValue("gravity", true)) { if (programnode->getBoolValue("gravity", true)) {
#ifdef OSG_PARTICLE_FIX
program->setToGravity(); program->setToGravity();
#else
if (attach == "world")
callback()->setupProgramGravity(true);
else
program->setToGravity();
#endif
} else } else
program->setAcceleration(osg::Vec3(0,0,0)); program->setAcceleration(osg::Vec3(0,0,0));
@ -545,7 +527,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());
#ifdef OSG_PARTICLE_FIX
if (particleFrame.valid()) { if (particleFrame.valid()) {
MatrixList mlist = node->getWorldMatrices(); MatrixList mlist = node->getWorldMatrices();
if (!mlist.empty()) { if (!mlist.empty()) {
@ -568,13 +550,5 @@ void Particles::operator()(osg::Node* node, osg::NodeVisitor* nv)
} }
if (program.valid() && useWind) if (program.valid() && useWind)
program->setWind(_wind); program->setWind(_wind);
#else
if (program.valid()) {
if (useGravity)
program->setAcceleration(GlobalParticleCallback::getGravityVector());
if (useWind)
program->setWind(GlobalParticleCallback::getWindVector());
}
#endif
} }
} // namespace simgear } // namespace simgear