mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-03 23:56:43 +00:00
Code Issues Releases Wiki Activity

Ensure non-negative particle life time, add size assertion

Browse source
This commit is contained in:
scrawl 2014-07-18 15:58:25 +02:00
parent 192d5ca08f
commit 1320ac6983
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/nifogre/ogrenifloader.cpp
View file

@ -762,8 +762,8 @@ class NIFObjectLoader
else else
emitter->setEmissionRate(partctrl->numParticles / (partctrl->lifetime + partctrl->lifetimeRandom/2)); emitter->setEmissionRate(partctrl->numParticles / (partctrl->lifetime + partctrl->lifetimeRandom/2));
emitter->setTimeToLive(partctrl->lifetime, emitter->setTimeToLive(std::max(0.f, partctrl->lifetime),
partctrl->lifetime + partctrl->lifetimeRandom); std::max(0.f, partctrl->lifetime + partctrl->lifetimeRandom));
emitter->setParameter("width", Ogre::StringConverter::toString(partctrl->offsetRandom.x)); emitter->setParameter("width", Ogre::StringConverter::toString(partctrl->offsetRandom.x));
emitter->setParameter("height", Ogre::StringConverter::toString(partctrl->offsetRandom.y)); emitter->setParameter("height", Ogre::StringConverter::toString(partctrl->offsetRandom.y));
emitter->setParameter("depth", Ogre::StringConverter::toString(partctrl->offsetRandom.z)); emitter->setParameter("depth", Ogre::StringConverter::toString(partctrl->offsetRandom.z));

4
components/nifogre/particles.cpp
View file

@ -448,12 +448,14 @@ public:
if(life_time-particle_time < mGrowTime) if(life_time-particle_time < mGrowTime)
{ {
Ogre::Real scale = (life_time-particle_time) / mGrowTime; Ogre::Real scale = (life_time-particle_time) / mGrowTime;
assert (scale >= 0);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }
if(particle_time < mFadeTime) if(particle_time < mFadeTime)
{ {
Ogre::Real scale = particle_time / mFadeTime; Ogre::Real scale = particle_time / mFadeTime;
assert (scale >= 0);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }
@ -479,12 +481,14 @@ public:
if(life_time-particle_time < mGrowTime) if(life_time-particle_time < mGrowTime)
{ {
Ogre::Real scale = (life_time-particle_time) / mGrowTime; Ogre::Real scale = (life_time-particle_time) / mGrowTime;
assert (scale >= 0);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }
if(particle_time < mFadeTime) if(particle_time < mFadeTime)
{ {
Ogre::Real scale = particle_time / mFadeTime; Ogre::Real scale = particle_time / mFadeTime;
assert (scale >= 0);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }