FGFS-4.1/OpenSceneGraph
3
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/ExplosionDebriEffect.cpp
View File

@@ -55,8 +55,6 @@ void ExplosionDebriEffect::setDefaults()
// set up unit particle.
_defaultParticleTemplate.setLifeTime(1.0+0.6*_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.0f, 1.0f));
_defaultParticleTemplate.setColorRange(osgParticle::rangev4(
@@ -93,9 +91,8 @@ void ExplosionDebriEffect::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);
}

11
src/osgParticle/ExplosionEffect.cpp
View File

@@ -54,13 +54,11 @@ void ExplosionEffect::setDefaults()
// set up unit particle.
_defaultParticleTemplate.setLifeTime(0.5+0.1*_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(
osg::Vec4(1.0f, 0.8f, 0.2f, 1.0f),
osg::Vec4(1.0f, 0.4f, 0.1f, 0.0f)));
osg::Vec4(1.0f, 0.8f, 0.2f, 1.0f),
osg::Vec4(1.0f, 0.4f, 0.1f, 0.0f)));
}
@@ -92,9 +90,8 @@ void ExplosionEffect::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);
}

8
src/osgParticle/FireEffect.cpp
View File

@@ -54,8 +54,6 @@ void FireEffect::setDefaults()
// set up unit particle.
_defaultParticleTemplate.setLifeTime(0.5+0.1*_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(
@@ -91,9 +89,9 @@ void FireEffect::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());
// these are physical properties of the particle
ptemplate.setRadius(radius);
ptemplate.setMass(density*radius*radius*radius*osg::PI*4.0f/3.0f);
}

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