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

Closes #716: Use the particle controller's size instead of NiAutoNormalParticlesData particle radius. Same as NifSkope now.

Browse source
This commit is contained in:
scrawl 2013-12-31 15:50:27 +01:00
parent 07a9b7623a
commit 764ec9bc5f
1 changed files with 2 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

@ -839,8 +839,6 @@ class NIFObjectLoader
vertprop, zprop, specprop, vertprop, zprop, specprop,
wireprop, needTangents)); wireprop, needTangents));
partsys->setDefaultDimensions(particledata->particleRadius*2.0f,
particledata->particleRadius*2.0f);
partsys->setCullIndividually(false); partsys->setCullIndividually(false);
partsys->setParticleQuota(particledata->numParticles); partsys->setParticleQuota(particledata->numParticles);
partsys->setKeepParticlesInLocalSpace(partflags & (Nif::NiNode::ParticleFlag_LocalSpace)); partsys->setKeepParticlesInLocalSpace(partflags & (Nif::NiNode::ParticleFlag_LocalSpace));
@ -856,6 +854,8 @@ 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, partctrl->size);
if(!partctrl->emitter.empty()) if(!partctrl->emitter.empty())
{ {
int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, partctrl->emitter->recIndex); int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, partctrl->emitter->recIndex);