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

Merge pull request #11636 from super626/v3.6 

fix bug some 3d sprite crash when texture missing on release mode
This commit is contained in:
minggo 2015-04-29 09:35:37 +08:00
parent 182dcd4152 e424cb4777
commit 37c9a9cb98
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/3d/CCSprite3D.cpp
View File

@ -645,14 +645,18 @@ void Sprite3D::removeAllAttachNode()
} }
_attachments.clear(); _attachments.clear();
} }
#if (!defined NDEBUG) || (defined CC_MODEL_VIEWER)
//Generate a dummy texture when the texture file is missing //Generate a dummy texture when the texture file is missing
static Texture2D * getDummyTexture() static Texture2D * getDummyTexture()
{ {
auto texture = Director::getInstance()->getTextureCache()->getTextureForKey("/dummyTexture"); auto texture = Director::getInstance()->getTextureCache()->getTextureForKey("/dummyTexture");
if(!texture) if(!texture)
{ {
#if (!defined NDEBUG)
unsigned char data[] ={0,0,0,0};//1*1 pure red picture
#else
unsigned char data[] ={255,0,0,255};//1*1 pure red picture unsigned char data[] ={255,0,0,255};//1*1 pure red picture
#endif
Image * image =new (std::nothrow) Image(); Image * image =new (std::nothrow) Image();
image->initWithRawData(data,sizeof(data),1,1,sizeof(unsigned char)); image->initWithRawData(data,sizeof(data),1,1,sizeof(unsigned char));
texture=Director::getInstance()->getTextureCache()->addImage(image,"/dummyTexture"); texture=Director::getInstance()->getTextureCache()->addImage(image,"/dummyTexture");
@ -660,7 +664,6 @@ static Texture2D * getDummyTexture()
} }
return texture; return texture;
} }
#endif
void Sprite3D::visit(cocos2d::Renderer *renderer, const cocos2d::Mat4 &parentTransform, uint32_t parentFlags) void Sprite3D::visit(cocos2d::Renderer *renderer, const cocos2d::Mat4 &parentTransform, uint32_t parentFlags)
{ {
@ -749,7 +752,6 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
auto programstate = mesh->getGLProgramState(); auto programstate = mesh->getGLProgramState();
auto& meshCommand = mesh->getMeshCommand(); auto& meshCommand = mesh->getMeshCommand();
#if (!defined NDEBUG) || (defined CC_MODEL_VIEWER)
GLuint textureID = 0; GLuint textureID = 0;
if(mesh->getTexture()) if(mesh->getTexture())
{ {
@ -761,10 +763,6 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
textureID = texture->getName(); textureID = texture->getName();
} }
#else
GLuint textureID = mesh->getTexture() ? mesh->getTexture()->getName() : 0;
#endif
bool isTransparent = (mesh->_isTransparent || color.a < 1.f); bool isTransparent = (mesh->_isTransparent || color.a < 1.f);
float globalZ = isTransparent ? 0 : _globalZOrder; float globalZ = isTransparent ? 0 : _globalZOrder;
if (isTransparent) if (isTransparent)