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

From Tim Moore, "his submission fixes a bug when the ModularEmitter and ParticleSystem are in different frames of reference. Specifically, it supports the case where the ParticleSystem is not in the world frame. One way this can come up is if your world coordinate system is Earth-centric; the float coordinates of particles don't have enough precision to avoid terrible jitter and other rendering artifacts, so it's convenient to root the particle systems in a local Z-up coordinate system that gets moved around from time to time.

Browse Source 
"

Tweak from Robert Osfield, converted code to use new Drawable::getWorldMatrices method
This commit is contained in:
Robert Osfield 2008-09-18 10:39:37 +00:00
parent 0969a5384b
commit 0d74d508df
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgParticle/ModularEmitter.cpp
View File

@ -25,19 +25,30 @@ void osgParticle::ModularEmitter::emit(double dt)
{ {
ConnectedParticleSystem* cps = dynamic_cast<ConnectedParticleSystem*>(getParticleSystem()); ConnectedParticleSystem* cps = dynamic_cast<ConnectedParticleSystem*>(getParticleSystem());
osg::Matrix worldToPs;
osg::MatrixList worldMats = getParticleSystem()->getWorldMatrices();
if (!worldMats.empty())
{
const osg::Matrix psToWorld = worldMats[0];
worldToPs = osg::Matrix::inverse(psToWorld);
}
if (getReferenceFrame() == RELATIVE_RF) if (getReferenceFrame() == RELATIVE_RF)
{ {
const osg::Matrix& ltw = getLocalToWorldMatrix(); const osg::Matrix& ltw = getLocalToWorldMatrix();
const osg::Matrix& previous_ltw = getPreviousLocalToWorldMatrix(); const osg::Matrix& previous_ltw = getPreviousLocalToWorldMatrix();
const osg::Matrix emitterToPs = ltw * worldToPs;
const osg::Matrix prevEmitterToPs = previous_ltw * worldToPs;
int n = _counter->numParticlesToCreate(dt); int n = _counter->numParticlesToCreate(dt);
if (_numParticleToCreateMovementCompensationRatio>0.0f) if (_numParticleToCreateMovementCompensationRatio>0.0f)
{ {
// compute the distance moved between frames // compute the distance moved between frames
const osg::Vec3 controlPosition = _placer->getControlPosition(); const osg::Vec3d controlPosition
osg::Vec3 previousPosition = controlPosition * previous_ltw; = osg::Vec3d(_placer->getControlPosition());
osg::Vec3 currentPosition = controlPosition * ltw; osg::Vec3d previousPosition = controlPosition * previous_ltw;
osg::Vec3d currentPosition = controlPosition * ltw;
float distance = (currentPosition-previousPosition).length(); float distance = (currentPosition-previousPosition).length();
float size = getUseDefaultTemplate() ? float size = getUseDefaultTemplate() ?
@ -59,9 +70,9 @@ void osgParticle::ModularEmitter::emit(double dt)
_placer->place(P); _placer->place(P);
_shooter->shoot(P); _shooter->shoot(P);
// now need to transform the position and velocity because we having a moving model. // Now need to transform the position and velocity because we having a moving model.
float r = ((float)rand()/(float)RAND_MAX); float r = ((float)rand()/(float)RAND_MAX);
P->transformPositionVelocity(ltw, previous_ltw, r); P->transformPositionVelocity(emitterToPs, prevEmitterToPs, r);
//P->transformPositionVelocity(ltw); //P->transformPositionVelocity(ltw);
if (cps) P->setUpTexCoordsAsPartOfConnectedParticleSystem(cps); if (cps) P->setUpTexCoordsAsPartOfConnectedParticleSystem(cps);
@ -82,7 +93,10 @@ void osgParticle::ModularEmitter::emit(double dt)
if (P) if (P)
{ {
_placer->place(P); _placer->place(P);
P->setPosition(P->getPosition() * worldToPs);
_shooter->shoot(P); _shooter->shoot(P);
P->setVelocity(osg::Matrix::transform3x3(P->getVelocity(),
worldToPs));
if (cps) P->setUpTexCoordsAsPartOfConnectedParticleSystem(cps); if (cps) P->setUpTexCoordsAsPartOfConnectedParticleSystem(cps);
} }