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

Merge pull request #3113 from dumganhar/iss2381-controlswitch 

ControlSwitch was displayed ugly when adding more than one switch.
This commit is contained in:
James Chen 2013-07-09 02:24:49 -07:00
parent 65d63380c0 5eb849a789
commit 66e9f8a187
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/GUI/CCControlExtension/CCControlSwitch.cpp
View File

@ -161,12 +161,10 @@ void ControlSwitchSprite::draw()
ccGLBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
getShaderProgram()->setUniformsForBuiltins();
glActiveTexture(GL_TEXTURE0);
glBindTexture( GL_TEXTURE_2D, getTexture()->getName());
ccGLBindTexture2DN(0, getTexture()->getName());
glUniform1i(_textureLocation, 0);
glActiveTexture(GL_TEXTURE1);
glBindTexture( GL_TEXTURE_2D, _maskTexture->getName() );
ccGLBindTexture2DN(1, _maskTexture->getName());
glUniform1i(_maskLocation, 1);
#define kQuadSize sizeof(_quad.bl)
@ -189,8 +187,9 @@ void ControlSwitchSprite::draw()
diff = offsetof( V3F_C4B_T2F, colors);
glVertexAttribPointer(kVertexAttrib_Color, 4, GL_UNSIGNED_BYTE, GL_TRUE, kQuadSize, (void*)(offset + diff));
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glActiveTexture(GL_TEXTURE0);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
ccGLBindTexture2DN(0, 0);
}
void ControlSwitchSprite::needsLayout()