Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

closed #3990: ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.

This commit is contained in:
James Chen 2014-02-11 18:25:57 +08:00
parent a255478127
commit c0b8460aef
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/2d/CCParticleSystemQuad.cpp
View File

@ -468,11 +468,10 @@ void ParticleSystemQuad::setTotalParticles(int tp)
_indices = indicesNew; _indices = indicesNew;
// Clear the memory // Clear the memory
// XXX: Bug? If the quads are cleared, then drawing doesn't work... WHY??? XXX
memset(_particles, 0, particlesSize); memset(_particles, 0, particlesSize);
memset(_quads, 0, quadsSize); memset(_quads, 0, quadsSize);
memset(_indices, 0, indicesSize); memset(_indices, 0, indicesSize);
_allocatedParticles = tp; _allocatedParticles = tp;
} }
else else
@ -506,6 +505,10 @@ void ParticleSystemQuad::setTotalParticles(int tp)
{ {
setupVBO(); setupVBO();
} }
// fixed http://www.cocos2d-x.org/issues/3990
// Updates texture coords.
setTexture(_texture);
} }
else else
{ {