teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Workaround for random AABB assertion due to zero-sized particles (Fixes #1663)

Browse source
This commit is contained in:
scrawl 2015-01-05 20:15:30 +01:00
parent 708dbc2518
commit afc961d19c
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/nifogre/ogrenifloader.cpp
View file

@ -973,7 +973,10 @@ class NIFObjectLoader
{ {
const Nif::NiParticleSystemController *partctrl = static_cast<const Nif::NiParticleSystemController*>(ctrl.getPtr()); const Nif::NiParticleSystemController *partctrl = static_cast<const Nif::NiParticleSystemController*>(ctrl.getPtr());
partsys->setDefaultDimensions(partctrl->size*2, partctrl->size*2); float size = partctrl->size*2;
// HACK: don't allow zero-sized particles which can rarely cause an AABB assertion in Ogre to fail
size = std::max(size, 0.00001f);
partsys->setDefaultDimensions(size, size);
if(!partctrl->emitter.empty()) if(!partctrl->emitter.empty())
{ {

8
components/nifogre/particles.cpp
View file

@ -452,6 +452,8 @@ public:
{ {
Ogre::Real scale = (life_time-particle_time) / mGrowTime; Ogre::Real scale = (life_time-particle_time) / mGrowTime;
assert (scale >= 0); assert (scale >= 0);
// HACK: don't allow zero-sized particles which can rarely cause an AABB assertion in Ogre to fail
scale = std::max(scale, 0.00001f);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }
@ -459,6 +461,8 @@ public:
{ {
Ogre::Real scale = particle_time / mFadeTime; Ogre::Real scale = particle_time / mFadeTime;
assert (scale >= 0); assert (scale >= 0);
// HACK: don't allow zero-sized particles which can rarely cause an AABB assertion in Ogre to fail
scale = std::max(scale, 0.00001f);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }
@ -485,6 +489,8 @@ public:
{ {
Ogre::Real scale = (life_time-particle_time) / mGrowTime; Ogre::Real scale = (life_time-particle_time) / mGrowTime;
assert (scale >= 0); assert (scale >= 0);
// HACK: don't allow zero-sized particles which can rarely cause an AABB assertion in Ogre to fail
scale = std::max(scale, 0.00001f);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }
@ -492,6 +498,8 @@ public:
{ {
Ogre::Real scale = particle_time / mFadeTime; Ogre::Real scale = particle_time / mFadeTime;
assert (scale >= 0); assert (scale >= 0);
// HACK: don't allow zero-sized particles which can rarely cause an AABB assertion in Ogre to fail
scale = std::max(scale, 0.00001f);
width *= scale; width *= scale;
height *= scale; height *= scale;
} }