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

merge cocos light work

This commit is contained in:
yangxiao 2014-08-27 14:53:39 +08:00
parent fdc0fad935
commit 8cb3edf91f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/3d/CCSprite3D.cpp
View File

@ -310,12 +310,13 @@ void Sprite3D::genGLProgramState()
{
if (hasNormal)
shader = GLProgram::SHADER_3D_POSITION_NORMAL_TEXTURE;
glProgram = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_3D_POSITION_TEXTURE);
else
shader = GLProgram::SHADER_3D_POSITION_TEXTURE;
}
}
else
{
glProgram = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_3D_POSITION);
shader = GLProgram::SHADER_3D_POSITION;
}
if (shader)
glProgram = GLProgramCache::getInstance()->getGLProgram(shader);