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

Removed redundent use of Geode to decorate the ParticleSystem

Browse Source
This commit is contained in:
Robert Osfield
2016-08-25 16:14:53 +01:00
parent 9800e1c201
commit 663024a215
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/osgparticle/osgparticle.cpp
View File

@@ -187,11 +187,8 @@ osgParticle::ParticleSystem *create_simple_particle_system(osg::Group *root)
// to create a Geode and add the particle system to it, so it can be
// displayed.
osg::Geode *geode = new osg::Geode;
geode->addDrawable(ps);
// add the geode to the scene graph
root->addChild(geode);
// add the ParticleSystem to the scene graph
root->addChild(ps);
return ps;
@@ -261,7 +258,7 @@ osgParticle::ParticleSystem *create_complex_particle_system(osg::Group *root)
osgParticle::SectorPlacer *placer = new osgParticle::SectorPlacer;
placer->setCenter(8, 0, 10);
placer->setRadiusRange(2.5, 5);
placer->setPhiRange(0, 2 * osg::PI); // 360<EFBFBD> angle to make a circle
placer->setPhiRange(0, 2 * osg::PI); // 360 angle to make a circle
emitter->setPlacer(placer);
// now let's setup the shooter; we use a RadialShooter but we set the
@@ -312,12 +309,8 @@ osgParticle::ParticleSystem *create_complex_particle_system(osg::Group *root)
// add the program to the scene graph
root->addChild(program);
// create a Geode to contain our particle system.
osg::Geode *geode = new osg::Geode;
geode->addDrawable(ps);
// add the geode to the scene graph.
root->addChild(geode);
// add the particle system to the scene graph.
root->addChild(ps);
return ps;
}
@@ -397,7 +390,7 @@ osgParticle::ParticleSystem *create_animated_particle_system(osg::Group *root)
osgParticle::SectorPlacer *placer = new osgParticle::SectorPlacer;
placer->setCenter(-8, 0, 0);
placer->setRadiusRange(2.5, 5);
placer->setPhiRange(0, 2 * osg::PI); // 360<EFBFBD> angle to make a circle
placer->setPhiRange(0, 2 * osg::PI); // 360 angle to make a circle
emitter1->setPlacer(placer);
emitter2->setPlacer(placer);