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

particle test: uses texturecache

This commit is contained in:
Ricardo Quesada 2012-05-03 16:07:29 -07:00 committed by Rolando Abarca
parent fe3880f0a6
commit 7e0c16c53d
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testjs/JS/1to1/test_particles.js
View File

@ -47,7 +47,7 @@ scenes['test_manual'] = function () {
scene.addChild(p1);
// p1.texture = cocos.TextureCache.sharedTextureCache.addImage( "stars2.png" );
p1.texture = cocos.TextureCache.sharedTextureCache().addImage( "stars2.png" );
p1.duration = 3;

14
testjs/libs/cocos2dx/particle_nodes/CCParticleSystem.cpp
View File

@ -342,20 +342,6 @@ bool CCParticleSystem::initWithTotalParticles(unsigned int numberOfParticles)
return false;
}
m_pTexture = CCTextureCache::sharedTextureCache()->addImage( "stars2.png" );
m_pTexture->retain();
m_tStartColor.r = 0.5;
m_tStartColor.g = 0.5;
m_tStartColor.b = 0.5;
m_tStartColor.a = 0.5;
m_tEndColor.r = 1.0;
m_tEndColor.g = 0.0;
m_tEndColor.b = 0.0;
m_tEndColor.a = 1.0;
// default, active
m_bIsActive = true;