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

remove unneeded codes

This commit is contained in:
minggo 2014-04-10 22:56:40 +08:00
parent 3703c6f73a
commit 951bf1cbfa
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos/2d/renderer/CCQuadCommand.cpp
View File

@ -49,21 +49,18 @@ void QuadCommand::init(float globalOrder, GLuint textureID, GLProgram* shader, B
{
_globalOrder = globalOrder;
_textureID = textureID;
_blendType = blendType;
_shader = shader;
_quadsCount = quadCount;
_quads = quad;
_mv = mv;
if( _textureID != _lastTextureID || _blendType.src != _lastBlendType.src || _blendType.dst != _lastBlendType.dst || _shader != _lastShader) {
if( _textureID != textureID || _blendType.src != blendType.src || _blendType.dst != blendType.dst || _shader != shader) {
_textureID = textureID;
_blendType = blendType;
_shader = shader;
generateMaterialID();
_lastShader = _shader;
_lastBlendType = _blendType;
_lastTextureID = _textureID;
}
}

3
cocos/2d/renderer/CCQuadCommand.h
View File

@ -71,13 +71,10 @@ protected:
uint32_t _materialID;
GLuint _textureID;
GLuint _lastTextureID;
GLProgram* _shader;
GLProgram* _lastShader;
BlendFunc _blendType;
BlendFunc _lastBlendType;
V3F_C4B_T2F_Quad* _quads;
ssize_t _quadsCount;