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

issue #1056: Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.

This commit is contained in:
James Chen 2012-03-28 21:44:28 +08:00
parent 3d63f9c58e
commit bb7485621e
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/include/CCParticleSystem.h
View File

@ -286,7 +286,6 @@ public:
virtual float getRotatePerSecondVar();
virtual void setRotatePerSecondVar(float degrees);
void setZOrder(int z);
virtual void setScale(float s);
virtual void setRotation(float newRotation);
virtual void setScaleX(float newScaleX);

4
cocos2dx/particle_nodes/CCParticleSystem.cpp
View File

@ -1104,10 +1104,6 @@ void CCParticleSystem::setEmitterMode(int var)
m_nEmitterMode = var;
}
void CCParticleSystem::setZOrder(int z)
{
m_nZOrder = z;
}
// ParticleSystem - methods for batchNode rendering

28
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
View File

@ -148,17 +148,17 @@ void CCParticleSystemQuad::initTexCoordsWithRect(const CCRect& pointRect)
for(unsigned int i=start; i<end; i++)
{
// bottom-left vertex:
m_pQuads[i].bl.texCoords.u = left;
m_pQuads[i].bl.texCoords.v = bottom;
quads[i].bl.texCoords.u = left;
quads[i].bl.texCoords.v = bottom;
// bottom-right vertex:
m_pQuads[i].br.texCoords.u = right;
m_pQuads[i].br.texCoords.v = bottom;
quads[i].br.texCoords.u = right;
quads[i].br.texCoords.v = bottom;
// top-left vertex:
m_pQuads[i].tl.texCoords.u = left;
m_pQuads[i].tl.texCoords.v = top;
quads[i].tl.texCoords.u = left;
quads[i].tl.texCoords.v = top;
// top-right vertex:
m_pQuads[i].tr.texCoords.u = right;
m_pQuads[i].tr.texCoords.v = top;
quads[i].tr.texCoords.u = right;
quads[i].tr.texCoords.v = top;
}
}
void CCParticleSystemQuad::setTextureWithRect(CCTexture2D *texture, const CCRect& rect)
@ -424,22 +424,22 @@ bool CCParticleSystemQuad::allocMemory()
void CCParticleSystemQuad::setBatchNode(CCParticleBatchNode * batchNode)
{
if( m_pBatchNode != batchNode ) {
CCParticleBatchNode *oldBatch = m_pBatchNode;
if( m_pBatchNode != batchNode )
{
CCParticleBatchNode* oldBatch = m_pBatchNode;
CCParticleSystem::setBatchNode(batchNode);
// NEW: is self render ?
if( ! batchNode ) {
if( ! batchNode )
{
allocMemory();
initIndices();
setTexture(oldBatch->getTexture());
initVAO();
}
// OLD: was it self render ? cleanup
else if( ! oldBatch )
else if( !oldBatch )
{
// copy current state to batch
ccV3F_C4B_T2F_Quad *batchQuads = m_pBatchNode->getTextureAtlas()->getQuads();

2
tests/tests/ParticleTest/ParticleTest.cpp
View File

@ -1258,7 +1258,7 @@ void ParticleBatchHybrid::switchRender(ccTime dt)
CCNode *newParent = (usingBatch ? m_pParent2 : m_pParent1 );
newParent->addChild(m_emitter);
CCLog("Particle: Using new parent: %p", newParent);
CCLog("Particle: Using new parent: %s", usingBatch ? "CCNode" : "CCParticleBatchNode");
}
std::string ParticleBatchHybrid::title()