Merge pull request #1905 from Jno1995/v2.2.1-release

fixed particle autoRemoveOnFinish bug
cocos · Oct 25, 2019 · defe008 · defe008
2 parents ba80c2f + 5afd3c7
commit defe008
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cocos/editor-support/particle/ParticleSimulator.cpp b/cocos/editor-support/particle/ParticleSimulator.cpp
@@ -99,13 +99,15 @@ ParticleSimulator::~ParticleSimulator()
 void ParticleSimulator::stop()
 {
     _active = false;
+    _readyToPlay = false;
     _elapsed = duration;
     _emitCounter = 0;
 }
 
 void ParticleSimulator::reset()
 {
     _active = true;
+    _readyToPlay = true;
     _elapsed = 0;
     _emitCounter = 0;
     _finished = false;
@@ -449,7 +451,7 @@ void ParticleSimulator::render(float dt)
     assembler->updateIABuffer(0, mb->getGLVB(), mb->getGLIB());
     assembler->updateIARange(0, indexStart, indexCount);
 
-    if (_particles.size() == 0 && !_active)
+    if (_particles.size() == 0 && !_active  && !_readyToPlay)
     {
         _finished = true;
         if (_finishedCallback)

diff --git a/cocos/editor-support/particle/ParticleSimulator.h b/cocos/editor-support/particle/ParticleSimulator.h
@@ -228,6 +228,7 @@ class ParticleSimulator : public cocos2d::middleware::IMiddleware, public cocos2
 private:
     std::vector<Particle*>          _particles;
     bool                            _active = false;
+    bool                            _readyToPlay = true;
     bool                            _finished = false;
     float                           _elapsed = 0;
     float                           _emitCounter = 0;