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

check sprite == nullptr 

remove unneeded namespace
This commit is contained in:
songchengjiang 2015-03-03 11:52:55 +08:00
parent 6b046c5236
commit e650ef2b4d
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/Particle3D/CCParticle3DRender.cpp
View File

@ -240,6 +240,11 @@ void Particle3DModelRender::render(Renderer* renderer, const Mat4 &transform, Pa
if (_spriteList.empty()){
for (unsigned int i = 0; i < particleSystem->getParticleQuota(); ++i){
Sprite3D *sprite = Sprite3D::create(_modelFile);
if (sprite == nullptr)
{
CCLOG("failed to load file %s", _modelFile.c_str());
continue;
}
sprite->setTexture(_texFile);
sprite->retain();
_spriteList.push_back(sprite);

7
extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.cpp
View File

@ -377,7 +377,7 @@ void PUParticle3DQuadRender::determineUVCoords( PUParticle3D *particle )
particle->rt_uv = particle->lb_uv + Vec2(_textureCoordsColStep, _textureCoordsRowStep);
}
void PUParticle3DQuadRender::fillVertex( unsigned short index, const cocos2d::Vec3 &pos, const cocos2d::Vec4 &color, const cocos2d::Vec2 &uv )
void PUParticle3DQuadRender::fillVertex( unsigned short index, const Vec3 &pos, const Vec4 &color, const Vec2 &uv )
{
_vertices[index].position = pos;
_vertices[index].color = color;
@ -439,6 +439,11 @@ void PUParticle3DModelRender::render( Renderer* renderer, const Mat4 &transform,
if (_spriteList.empty()){
for (unsigned int i = 0; i < particleSystem->getParticleQuota(); ++i){
Sprite3D *sprite = Sprite3D::create(_modelFile);
if (sprite == nullptr)
{
CCLOG("failed to load file %s", _modelFile.c_str());
continue;
}
sprite->setTexture(_texFile);
sprite->retain();
_spriteList.push_back(sprite);

2
extensions/Particle3D/ParticleUniverse/ParticleRenders/CCPUParticle3DRender.h
View File

@ -161,7 +161,7 @@ protected:
void getOriginOffset(int &offsetX, int &offsetY);
void determineUVCoords(PUParticle3D *particle);
void fillVertex(unsigned short index, const cocos2d::Vec3 &pos, const cocos2d::Vec4 &color, const cocos2d::Vec2 &uv);
void fillVertex(unsigned short index, const Vec3 &pos, const Vec4 &color, const Vec2 &uv);
void fillTriangle(unsigned short index, unsigned short v0, unsigned short v1, unsigned short v2);
protected: