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

Added .osg support for new ParticleEffect::s/getDefaultParticleTemplate.

Browse Source
This commit is contained in:
Robert Osfield
2005-05-11 16:05:27 +00:00
parent 52666a6dee
commit afb92b2372
5 changed files with 77 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgParticle/SmokeEffect.cpp
View File

@@ -50,8 +50,6 @@ void SmokeEffect::setDefaults()
// set up unit particle.
_defaultParticleTemplate.setLifeTime(5.0*_scale);
_defaultParticleTemplate.setRadius(1.0f);
_defaultParticleTemplate.setMass(osg::PI*4.0f/3.0f);
_defaultParticleTemplate.setSizeRange(osgParticle::rangef(0.75f, 3.0f));
_defaultParticleTemplate.setAlphaRange(osgParticle::rangef(0.1f, 1.0f));
_defaultParticleTemplate.setColorRange(osgParticle::rangev4(
@@ -88,9 +86,8 @@ void SmokeEffect::setUpEmitterAndProgram()
ptemplate.setColorRange(_defaultParticleTemplate.getColorRange());
// these are physical properties of the particle
float r = _defaultParticleTemplate.getRadius()*radius;
ptemplate.setRadius(r);
ptemplate.setMass(density*r*r*r*_defaultParticleTemplate.getMass());
ptemplate.setRadius(radius);
ptemplate.setMass(density*radius*radius*radius*osg::PI*4.0f/3.0f);
}