mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-04 17:45:33 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'kcat/nifogre'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-04-11 00:17:15 +02:00
commit 817c652951
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/nif/data.hpp
View file

@ -167,7 +167,7 @@ class NiAutoNormalParticlesData : public ShapeData
public: public:
int numParticles; int numParticles;
float particleSize; float particleRadius;
int activeCount; int activeCount;
@ -180,7 +180,7 @@ public:
// Should always match the number of vertices // Should always match the number of vertices
numParticles = nif->getUShort(); numParticles = nif->getUShort();
particleSize = nif->getFloat(); particleRadius = nif->getFloat();
activeCount = nif->getUShort(); activeCount = nif->getUShort();
if(nif->getInt()) if(nif->getInt())

3
components/nifogre/ogrenifloader.cpp
View file

@ -1543,7 +1543,8 @@ class NIFObjectLoader : Ogre::ManualResourceLoader
vertprop, zprop, specprop, vertprop, zprop, specprop,
wireprop, needTangents)); wireprop, needTangents));
partsys->setDefaultDimensions(particledata->particleSize, particledata->particleSize); partsys->setDefaultDimensions(particledata->particleRadius*2.0f,
particledata->particleRadius*2.0f);
partsys->setCullIndividually(false); partsys->setCullIndividually(false);
partsys->setParticleQuota(particledata->numParticles); partsys->setParticleQuota(particledata->numParticles);