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

From Sondra Iverson:

Browse Source 
small optimization to ParticleSystem.cpp moving sqrtf out of inner loop.
     fix of copy and past error changing erronous cullTimes to drawTimes.
This commit is contained in:
Robert Osfield
2003-11-06 22:06:44 +00:00
parent 71cae09943
commit d3251dc9d8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgParticle/ParticleSystem.cpp
View File

@@ -171,6 +171,7 @@ void osgParticle::ParticleSystem::single_pass_render(osg::State & /*state*/, con
i0->beginRender();
float scale = sqrtf(static_cast<float>(detail_));
for (i=i0; i<end; i+=detail_) {
if (i->isAlive()) {
if (i->getShape() != i0->getShape()) {
@@ -182,10 +183,10 @@ void osgParticle::ParticleSystem::single_pass_render(osg::State & /*state*/, con
switch (alignment_) {
case BILLBOARD:
i->render(modelview.preMult(i->getPosition()), osg::Vec3(1, 0, 0), osg::Vec3(0, 1, 0), sqrtf(static_cast<float>(detail_)));
i->render(modelview.preMult(i->getPosition()), osg::Vec3(1, 0, 0), osg::Vec3(0, 1, 0), scale);
break;
case FIXED:
i->render(i->getPosition(), align_X_axis_, align_Y_axis_, sqrtf(static_cast<float>(detail_)));
i->render(i->getPosition(), align_X_axis_, align_Y_axis_, scale);
break;
default: ;
}

2
src/osgProducer/ViewerEventHandler.cpp
View File

@@ -541,7 +541,7 @@ void ViewerEventHandler::StatsAndHelpDrawCallback::displayStats()
(*itr)->draw(*(sv->getState()));
}
for(itr=_drawTimeText.begin(),titr = _drawTimes.begin();
itr!=_drawTimeText.end() && titr!=_cullTimes.end();
itr!=_drawTimeText.end() && titr!=_drawTimes.end();
++itr,++titr)
{
sprintf(tmpText,"%4.2f",1000.0*(*titr)/(double)_fs.size());