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

issue #1686:synchronize CCParticleSystemQuad.cpp

This commit is contained in:
minggo 2013-02-27 16:24:33 +08:00
parent 510c54ffb0
commit 24e8664700
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
View File

@ -221,7 +221,7 @@ void CCParticleSystemQuad::setDisplayFrame(CCSpriteFrame *spriteFrame)
}
}
void CCParticleSystemQuad::setupIndices()
void CCParticleSystemQuad::initIndices()
{
for(unsigned int i = 0; i < m_uTotalParticles; ++i)
{
@ -420,6 +420,7 @@ void CCParticleSystemQuad::setTotalParticles(unsigned int tp)
m_pIndices = indicesNew;
// Clear the memory
// XXX: Bug? If the quads are cleared, then drawing doesn't work... WHY??? XXX
memset(m_pParticles, 0, particlesSize);
memset(m_pQuads, 0, quadsSize);
memset(m_pIndices, 0, indicesSize);
@ -448,7 +449,7 @@ void CCParticleSystemQuad::setTotalParticles(unsigned int tp)
}
}
setupIndices();
initIndices();
#if CC_TEXTURE_ATLAS_USE_VAO
setupVBOandVAO();
#else
@ -459,11 +460,17 @@ void CCParticleSystemQuad::setTotalParticles(unsigned int tp)
{
m_uTotalParticles = tp;
}
resetSystem();
}
#if CC_TEXTURE_ATLAS_USE_VAO
void CCParticleSystemQuad::setupVBOandVAO()
{
// clean VAO
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
glGenVertexArrays(1, &m_uVAOname);
ccGLBindVAO(m_uVAOname);
@ -500,6 +507,8 @@ void CCParticleSystemQuad::setupVBOandVAO()
void CCParticleSystemQuad::setupVBO()
{
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glGenBuffers(2, &m_pBuffersVBO[0]);
glBindBuffer(GL_ARRAY_BUFFER, m_pBuffersVBO[0]);
@ -562,7 +571,7 @@ void CCParticleSystemQuad::setBatchNode(CCParticleBatchNode * batchNode)
if( ! batchNode )
{
allocMemory();
setupIndices();
initIndices();
setTexture(oldBatch->getTexture());
#if CC_TEXTURE_ATLAS_USE_VAO
setupVBOandVAO();

2
cocos2dx/particle_nodes/CCParticleSystemQuad.h
View File

@ -72,7 +72,7 @@ public:
static CCParticleSystemQuad * create(const char *plistFile);
/** initializes the indices for the vertices*/
void setupIndices();
void initIndices();
/** initializes the texture with a rectangle measured Points */
void initTexCoordsWithRect(const CCRect& rect);