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

closed #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked.

This commit is contained in:
James Chen 2013-07-09 18:33:36 +08:00
parent 66e9f8a187
commit 87cec1622c
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cocos2dx/sprite_nodes/CCSprite.cpp
View File

@ -550,25 +550,12 @@ void Sprite::draw(void)
CCAssert(!_batchNode, "If Sprite is being rendered by SpriteBatchNode, Sprite#draw SHOULD NOT be called"); CCAssert(!_batchNode, "If Sprite is being rendered by SpriteBatchNode, Sprite#draw SHOULD NOT be called");
CC_NODE_DRAW_SETUP();
ccGLBlendFunc( _blendFunc.src, _blendFunc.dst ); ccGLBlendFunc( _blendFunc.src, _blendFunc.dst );
if (_texture != NULL)
{
CC_NODE_DRAW_SETUP();
ccGLBindTexture2D( _texture->getName() ); ccGLBindTexture2D( _texture->getName() );
ccGLEnableVertexAttribs( kVertexAttribFlag_PosColorTex ); ccGLEnableVertexAttribs( kVertexAttribFlag_PosColorTex );
}
else
{
// If the texture is invalid, uses the PositionColor shader instead.
// TODO: PostionTextureColor shader should support empty texture. In that way, we could get rid of next three lines.
GLProgram* prog = ShaderCache::sharedShaderCache()->programForKey(kShader_PositionColor);
prog->use();
prog->setUniformsForBuiltins();
ccGLBindTexture2D(0);
ccGLEnableVertexAttribs( kVertexAttribFlag_Position | kVertexAttribFlag_Color );
}
#define kQuadSize sizeof(_quad.bl) #define kQuadSize sizeof(_quad.bl)
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
@ -582,12 +569,9 @@ void Sprite::draw(void)
int diff = offsetof( V3F_C4B_T2F, vertices); int diff = offsetof( V3F_C4B_T2F, vertices);
glVertexAttribPointer(kVertexAttrib_Position, 3, GL_FLOAT, GL_FALSE, kQuadSize, (void*) (offset + diff)); glVertexAttribPointer(kVertexAttrib_Position, 3, GL_FLOAT, GL_FALSE, kQuadSize, (void*) (offset + diff));
if (_texture != NULL)
{
// texCoods // texCoods
diff = offsetof( V3F_C4B_T2F, texCoords); diff = offsetof( V3F_C4B_T2F, texCoords);
glVertexAttribPointer(kVertexAttrib_TexCoords, 2, GL_FLOAT, GL_FALSE, kQuadSize, (void*)(offset + diff)); glVertexAttribPointer(kVertexAttrib_TexCoords, 2, GL_FLOAT, GL_FALSE, kQuadSize, (void*)(offset + diff));
}
// color // color
diff = offsetof( V3F_C4B_T2F, colors); diff = offsetof( V3F_C4B_T2F, colors);
@ -1083,6 +1067,14 @@ void Sprite::updateBlendFunc(void)
} }
} }
static unsigned char cc_2x2_white_image[] = {
// RGBA8888
0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF
};
void Sprite::setTexture(Texture2D *texture) void Sprite::setTexture(Texture2D *texture)
{ {
// If batchnode, then texture id should be the same // If batchnode, then texture id should be the same
@ -1090,6 +1082,17 @@ void Sprite::setTexture(Texture2D *texture)
// accept texture==nil as argument // accept texture==nil as argument
CCAssert( !texture || dynamic_cast<Texture2D*>(texture), "setTexture expects a Texture2D. Invalid argument"); CCAssert( !texture || dynamic_cast<Texture2D*>(texture), "setTexture expects a Texture2D. Invalid argument");
if (nullptr == texture)
{
Image* image = new Image();
bool isOK = image->initWithImageData(cc_2x2_white_image, sizeof(cc_2x2_white_image), Image::kFmtRawData, 2, 2, 8);
if (isOK) {
texture = TextureCache::sharedTextureCache()->addUIImage(image, "cc_2x2_white_image");
}
CC_SAFE_RELEASE(image);
}
if (!_batchNode && _texture != texture) if (!_batchNode && _texture != texture)
{ {
CC_SAFE_RETAIN(texture); CC_SAFE_RETAIN(texture);