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

Merge branch 'work1'

This commit is contained in:
liswei 2011-06-14 16:29:41 +08:00
parent 71b5c890da 7c669cfcb4
commit 585792f3da
4 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/include/CCParticleSystemPoint.h
View File

@ -51,6 +51,12 @@ public:
:m_pVertices(NULL)
{}
virtual ~CCParticleSystemPoint();
/** creates an initializes a CCParticleSystemPoint from a plist file.
This plist files can be creted manually or with Particle Designer:
*/
static CCParticleSystemPoint * particleWithFile(const char *plistFile);
// super methods
virtual bool initWithTotalParticles(int numberOfParticles);
virtual void updateQuadWithParticle(tCCParticle* particle, CCPoint newPosition);

6
cocos2dx/include/CCParticleSystemQuad.h
View File

@ -60,6 +60,12 @@ public:
,m_pIndices(NULL)
{}
virtual ~CCParticleSystemQuad();
/** creates an initializes a CCParticleSystemQuad from a plist file.
This plist files can be creted manually or with Particle Designer:
*/
static CCParticleSystemQuad * particleWithFile(const char *plistFile);
/** initialices the indices for the vertices*/
void initIndices();

14
cocos2dx/particle_nodes/CCParticleSystemPoint.cpp
View File

@ -60,6 +60,20 @@ CCParticleSystemPoint::~CCParticleSystemPoint()
glDeleteBuffers(1, &m_uVerticesID);
#endif
}
// implementation CCParticleSystemPoint
CCParticleSystemPoint * CCParticleSystemPoint::particleWithFile(const char *plistFile)
{
CCParticleSystemPoint *pRet = new CCParticleSystemPoint();
if (pRet && pRet->initWithFile(plistFile))
{
pRet->autorelease();
return pRet;
}
CC_SAFE_DELETE(pRet)
return pRet;
}
void CCParticleSystemPoint::updateQuadWithParticle(tCCParticle* particle, CCPoint newPosition)
{
// place vertices and colos in array

14
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
View File

@ -32,7 +32,6 @@ THE SOFTWARE.
namespace cocos2d {
//implementation CCParticleSystemQuad
// overriding the init method
bool CCParticleSystemQuad::initWithTotalParticles(int numberOfParticles)
{
@ -88,6 +87,19 @@ CCParticleSystemQuad::~CCParticleSystemQuad()
#endif
}
// implementation CCParticleSystemQuad
CCParticleSystemQuad * CCParticleSystemQuad::particleWithFile(const char *plistFile)
{
CCParticleSystemQuad *pRet = new CCParticleSystemQuad();
if (pRet && pRet->initWithFile(plistFile))
{
pRet->autorelease();
return pRet;
}
CC_SAFE_DELETE(pRet)
return pRet;
}
// rect should be in Texture coordinates, not pixel coordinates
void CCParticleSystemQuad::initTexCoordsWithRect(CCRect pointRect)
{