mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:23:52 +00:00
Code Issues Releases Wiki Activity

Fix for copy construction of particle system templates

Browse source
This commit is contained in:
scrawl 2015-03-26 17:39:33 +01:00
parent 99c9907ff3
commit 60f288195f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/nifosg/particle.cpp
View file

@ -23,6 +23,9 @@ ParticleSystem::ParticleSystem(const ParticleSystem &copy, const osg::CopyOp &co
: osgParticle::ParticleSystem(copy, copyop) : osgParticle::ParticleSystem(copy, copyop)
, mQuota(copy.mQuota) , mQuota(copy.mQuota)
{ {
// For some reason the osgParticle constructor doesn't copy the particles
for (int i=0;i<copy.numParticles()-copy.numDeadParticles();++i)
_particles.push_back(*copy.getParticle(i));
} }
void ParticleSystem::setQuota(int quota) void ParticleSystem::setQuota(int quota)
@ -201,6 +204,10 @@ Emitter::Emitter()
Emitter::Emitter(const Emitter &copy, const osg::CopyOp &copyop) Emitter::Emitter(const Emitter &copy, const osg::CopyOp &copyop)
: osgParticle::Emitter(copy, copyop) : osgParticle::Emitter(copy, copyop)
, mTargets(copy.mTargets) , mTargets(copy.mTargets)
, mPlacer(copy.mPlacer)
, mShooter(copy.mShooter)
// need a deep copy because the remainder is stored in the object
, mCounter(osg::clone(copy.mCounter.get(), osg::CopyOp::DEEP_COPY_ALL))
{ {
} }