refactoring scale9sprite and fix gray scale shader

This commit is contained in:
zilongshanren
2016-09-07 14:45:57 +08:00
parent 6747b2cb3d
commit e8f195cf82
8 changed files with 71 additions and 62 deletions
@@ -53,6 +53,7 @@ enum {
kShaderType_LabelDistanceFieldNormal,
kShaderType_LabelDistanceFieldGlow,
kShaderType_UIGrayScale,
kShaderType_SpriteDistortion,
kShaderType_LabelNormal,
kShaderType_LabelOutline,
kShaderType_CameraClear,
@@ -193,6 +194,10 @@ void GLProgramCache::loadDefaultGLPrograms()
loadDefaultGLProgram(p, kShaderType_UIGrayScale);
_programs.insert(std::make_pair(GLProgram::SHADER_NAME_POSITION_GRAYSCALE, p));
p = new (std::nothrow) GLProgram();
loadDefaultGLProgram(p, kShaderType_SpriteDistortion);
_programs.insert(std::make_pair(GLProgram::SHADER_NAME_SPRITE_DISTORTION, p));
p = new (std::nothrow) GLProgram();
loadDefaultGLProgram(p, kShaderType_LabelNormal);
_programs.insert( std::make_pair(GLProgram::SHADER_NAME_LABEL_NORMAL, p) );
@@ -305,6 +310,10 @@ void GLProgramCache::reloadDefaultGLPrograms()
p = getGLProgram(GLProgram::SHADER_NAME_POSITION_GRAYSCALE);
p->reset();
loadDefaultGLProgram(p, kShaderType_UIGrayScale);
p = getGLProgram(GLProgram::SHADER_NAME_SPRITE_DISTORTION);
p->reset();
loadDefaultGLProgram(p, kShaderType_SpriteDistortion);
}
void GLProgramCache::reloadDefaultGLProgramsRelativeToLights()
@@ -361,6 +370,9 @@ void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type)
p->initWithByteArrays(ccPositionTextureColor_noMVP_vert,
ccPositionTexture_GrayScale_frag);
break;
case kShaderType_SpriteDistortion:
p->initWithByteArrays(ccPositionTextureColor_noMVP_vert, ccSprite_Distortion_frag);
break;
case kShaderType_LabelNormal:
p->initWithByteArrays(ccLabel_vert, ccLabelNormal_frag);
break;