diff --git a/src/osgParticle/ParticleSystem.cpp b/src/osgParticle/ParticleSystem.cpp index 9beadf1ec..484712f0f 100644 --- a/src/osgParticle/ParticleSystem.cpp +++ b/src/osgParticle/ParticleSystem.cpp @@ -171,6 +171,7 @@ void osgParticle::ParticleSystem::single_pass_render(osg::State & /*state*/, con i0->beginRender(); + float scale = sqrtf(static_cast(detail_)); for (i=i0; iisAlive()) { 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(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(detail_))); + i->render(i->getPosition(), align_X_axis_, align_Y_axis_, scale); break; default: ; } diff --git a/src/osgProducer/ViewerEventHandler.cpp b/src/osgProducer/ViewerEventHandler.cpp index 5a9a132bb..07e7f1df7 100644 --- a/src/osgProducer/ViewerEventHandler.cpp +++ b/src/osgProducer/ViewerEventHandler.cpp @@ -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());