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

Merge pull request #3065 from dumganhar/iss2359-ccontrolswitch 

Sprite will become white block when using CCControlSwitch.
setShaderProgram should not be in Sprite::setTexture since setTexture is not related to shader.
This commit is contained in:
James Chen 2013-07-03 01:22:14 -07:00
parent 331c688f6f 501afdd2e3
commit b441871cd1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cocos2dx/sprite_nodes/CCSprite.cpp
View File

@ -182,6 +182,16 @@ bool Sprite::initWithTexture(Texture2D *pTexture, const Rect& rect, bool rotated
_quad.tl.colors = tmpColor;
_quad.tr.colors = tmpColor;
// shader program
if (pTexture)
{
setShaderProgram(ShaderCache::sharedShaderCache()->programForKey(kShader_PositionTextureColor));
}
else
{
setShaderProgram(ShaderCache::sharedShaderCache()->programForKey(kShader_PositionColor));
}
// update texture (calls updateBlendFunc)
setTexture(pTexture);
setTextureRect(rect, rotated, rect.size);
@ -1081,16 +1091,6 @@ void Sprite::setTexture(Texture2D *texture)
CCAssert(! _batchNode || texture->getName() == _batchNode->getTexture()->getName(), "CCSprite: Batched sprites should use the same texture as the batchnode");
// accept texture==nil as argument
CCAssert( !texture || dynamic_cast<Texture2D*>(texture), "setTexture expects a Texture2D. Invalid argument");
// shader program
if (texture)
{
setShaderProgram(ShaderCache::sharedShaderCache()->programForKey(kShader_PositionTextureColor));
}
else
{
setShaderProgram(ShaderCache::sharedShaderCache()->programForKey(kShader_PositionColor));
}
if (!_batchNode && _texture != texture)
{