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

Fix minor typo: Texure -> Texture

This commit is contained in:
mogemimi 2016-05-26 02:36:15 +09:00
parent 4e92b82571
commit f6bee1abc2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/renderer/CCGLProgramCache.cpp
View File

@ -49,7 +49,7 @@ enum {
kShaderType_PositionTexture_uColor, kShaderType_PositionTexture_uColor,
kShaderType_PositionTextureA8Color, kShaderType_PositionTextureA8Color,
kShaderType_Position_uColor, kShaderType_Position_uColor,
kShaderType_PositionLengthTexureColor, kShaderType_PositionLengthTextureColor,
kShaderType_LabelDistanceFieldNormal, kShaderType_LabelDistanceFieldNormal,
kShaderType_LabelDistanceFieldGlow, kShaderType_LabelDistanceFieldGlow,
kShaderType_UIGrayScale, kShaderType_UIGrayScale,
@ -202,7 +202,7 @@ void GLProgramCache::loadDefaultGLPrograms()
// Position, Length(TexCoords, Color (used by Draw Node basically ) // Position, Length(TexCoords, Color (used by Draw Node basically )
// //
p = new (std::nothrow) GLProgram(); p = new (std::nothrow) GLProgram();
loadDefaultGLProgram(p, kShaderType_PositionLengthTexureColor); loadDefaultGLProgram(p, kShaderType_PositionLengthTextureColor);
_programs.insert( std::make_pair(GLProgram::SHADER_NAME_POSITION_LENGTH_TEXTURE_COLOR, p) ); _programs.insert( std::make_pair(GLProgram::SHADER_NAME_POSITION_LENGTH_TEXTURE_COLOR, p) );
p = new (std::nothrow) GLProgram(); p = new (std::nothrow) GLProgram();
@ -352,7 +352,7 @@ void GLProgramCache::reloadDefaultGLPrograms()
// //
p = getGLProgram(GLProgram::SHADER_NAME_POSITION_LENGTH_TEXTURE_COLOR); p = getGLProgram(GLProgram::SHADER_NAME_POSITION_LENGTH_TEXTURE_COLOR);
p->reset(); p->reset();
loadDefaultGLProgram(p, kShaderType_PositionLengthTexureColor); loadDefaultGLProgram(p, kShaderType_PositionLengthTextureColor);
p = getGLProgram(GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_NORMAL); p = getGLProgram(GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_NORMAL);
p->reset(); p->reset();
@ -487,7 +487,7 @@ void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type)
p->initWithByteArrays(ccPosition_uColor_vert, ccPosition_uColor_frag); p->initWithByteArrays(ccPosition_uColor_vert, ccPosition_uColor_frag);
p->bindAttribLocation("aVertex", GLProgram::VERTEX_ATTRIB_POSITION); p->bindAttribLocation("aVertex", GLProgram::VERTEX_ATTRIB_POSITION);
break; break;
case kShaderType_PositionLengthTexureColor: case kShaderType_PositionLengthTextureColor:
p->initWithByteArrays(ccPositionColorLengthTexture_vert, ccPositionColorLengthTexture_frag); p->initWithByteArrays(ccPositionColorLengthTexture_vert, ccPositionColorLengthTexture_frag);
break; break;
case kShaderType_LabelDistanceFieldNormal: case kShaderType_LabelDistanceFieldNormal: