diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-12-31 21:40:07 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-12-31 21:40:07 +0300 |
commit | a1b0ccfbb80cf2e0dc80a52971a0f50261b8b7d6 (patch) | |
tree | fa91fbd708dfce9baef9b33bd60455c7756dd55b /src/particle/particleemitter.cpp | |
parent | 627e8fbd919f346e4e45ef192b516faf8b11d4ac (diff) | |
download | plus-a1b0ccfbb80cf2e0dc80a52971a0f50261b8b7d6.tar.gz plus-a1b0ccfbb80cf2e0dc80a52971a0f50261b8b7d6.tar.bz2 plus-a1b0ccfbb80cf2e0dc80a52971a0f50261b8b7d6.tar.xz plus-a1b0ccfbb80cf2e0dc80a52971a0f50261b8b7d6.zip |
Move particlechangefunc into enums directory.
Diffstat (limited to 'src/particle/particleemitter.cpp')
-rw-r--r-- | src/particle/particleemitter.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp index b8ae200ce..855c62fa1 100644 --- a/src/particle/particleemitter.cpp +++ b/src/particle/particleemitter.cpp @@ -473,13 +473,25 @@ ParticleEmitter::readParticleEmitterProp(XmlNodePtrConst propertyNode, T def) const int period = XML::getProperty(propertyNode, "change-period", 0); const int phase = XML::getProperty(propertyNode, "change-phase", 0); if (change == "saw" || change == "sawtooth") - retval.setFunction(FUNC_SAW, amplitude, period, phase); + { + retval.setFunction(ParticleChangeFunc::FUNC_SAW, + amplitude, period, phase); + } else if (change == "sine" || change == "sinewave") - retval.setFunction(FUNC_SINE, amplitude, period, phase); + { + retval.setFunction(ParticleChangeFunc::FUNC_SINE, + amplitude, period, phase); + } else if (change == "triangle") - retval.setFunction(FUNC_TRIANGLE, amplitude, period, phase); + { + retval.setFunction(ParticleChangeFunc::FUNC_TRIANGLE, + amplitude, period, phase); + } else if (change == "square") - retval.setFunction(FUNC_SQUARE, amplitude, period, phase); + { + retval.setFunction(ParticleChangeFunc::FUNC_SQUARE, + amplitude, period, phase); + } return retval; } |