diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 33a32c6c8e..780efa2102 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1566,50 +1566,42 @@ 5034CA1E191D591100CE6051 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F9191D591000CE6051 /* CCShaderCache.h */; }; 5034CA1F191D591100CE6051 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCShaderCache.cpp */; }; 5034CA20191D591100CE6051 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCShaderCache.cpp */; }; - 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; - 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; - 5034CA23191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */; }; - 5034CA24191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */; }; - 5034CA25191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; - 5034CA26191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; - 5034CA27191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; - 5034CA28191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; - 5034CA29191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */; }; - 5034CA2A191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */; }; - 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */; }; - 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */; }; - 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */; }; - 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */; }; - 5034CA2F191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */; }; - 5034CA30191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */; }; - 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */; }; - 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */; }; - 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */; }; - 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */; }; - 5034CA35191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */; }; - 5034CA36191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */; }; - 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */; }; - 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */; }; - 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */; }; - 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */; }; - 5034CA3B191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */; }; - 5034CA3C191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */; }; - 5034CA3D191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */; }; - 5034CA3E191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */; }; - 5034CA3F191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */; }; - 5034CA40191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */; }; - 5034CA41191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */; }; - 5034CA42191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */; }; - 5034CA43191D591100CE6051 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */; }; - 5034CA44191D591100CE6051 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */; }; - 5034CA45191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */; }; - 5034CA46191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */; }; - 5034CA47191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */; }; - 5034CA48191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */; }; - 5034CA49191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */; }; - 5034CA4A191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */; }; - 5034CA4B191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */; }; - 5034CA4C191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */; }; + 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */; }; + 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */; }; + 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */; }; + 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */; }; + 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color.frag */; }; + 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color.frag */; }; + 5034CA2F191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */; }; + 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */; }; + 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */; }; + 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */; }; + 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */; }; + 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */; }; + 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture.frag */; }; + 5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture.frag */; }; + 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture.vert */; }; + 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture.vert */; }; + 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture.frag */; }; + 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture.frag */; }; + 5034CA3B191D591100CE6051 /* ccShader_PositionColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA08191D591000CE6051 /* ccShader_PositionColor.vert */; }; + 5034CA3C191D591100CE6051 /* ccShader_PositionColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA08191D591000CE6051 /* ccShader_PositionColor.vert */; }; + 5034CA3D191D591100CE6051 /* ccShader_PositionColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA09191D591000CE6051 /* ccShader_PositionColor.frag */; }; + 5034CA3E191D591100CE6051 /* ccShader_PositionColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA09191D591000CE6051 /* ccShader_PositionColor.frag */; }; + 5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0A191D591000CE6051 /* ccShader_Position_uColor.vert */; }; + 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0A191D591000CE6051 /* ccShader_Position_uColor.vert */; }; + 5034CA41191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0B191D591000CE6051 /* ccShader_Position_uColor.frag */; }; + 5034CA42191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0B191D591000CE6051 /* ccShader_Position_uColor.frag */; }; + 5034CA43191D591100CE6051 /* ccShader_Label.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0C191D591000CE6051 /* ccShader_Label.vert */; }; + 5034CA44191D591100CE6051 /* ccShader_Label.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0C191D591000CE6051 /* ccShader_Label.vert */; }; + 5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0D191D591000CE6051 /* ccShader_Label_outline.frag */; }; + 5034CA46191D591100CE6051 /* ccShader_Label_outline.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0D191D591000CE6051 /* ccShader_Label_outline.frag */; }; + 5034CA47191D591100CE6051 /* ccShader_Label_normal.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0E191D591000CE6051 /* ccShader_Label_normal.frag */; }; + 5034CA48191D591100CE6051 /* ccShader_Label_normal.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0E191D591000CE6051 /* ccShader_Label_normal.frag */; }; + 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */; }; + 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */; }; + 5034CA4B191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */; }; + 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */; }; 5034CA4D191D591100CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA11191D591000CE6051 /* ccGLStateCache.h */; }; 5034CA4E191D591100CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA11191D591000CE6051 /* ccGLStateCache.h */; }; 5034CA4F191D591100CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */; }; @@ -2678,28 +2670,24 @@ 5034C9F8191D591000CE6051 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; 5034C9F9191D591000CE6051 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = ""; }; 5034C9FA191D591000CE6051 /* CCShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCShaderCache.cpp; sourceTree = ""; }; - 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColorAlphaTest_frag.h; sourceTree = ""; }; - 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_vert.h; sourceTree = ""; }; - 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_vert.h; sourceTree = ""; }; - 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_frag.h; sourceTree = ""; }; - 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_frag.h; sourceTree = ""; }; - 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_vert.h; sourceTree = ""; }; - 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_frag.h; sourceTree = ""; }; - 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_vert.h; sourceTree = ""; }; - 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_vert.h; sourceTree = ""; }; - 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_frag.h; sourceTree = ""; }; - 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_frag.h; sourceTree = ""; }; - 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_vert.h; sourceTree = ""; }; - 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_frag.h; sourceTree = ""; }; - 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_vert.h; sourceTree = ""; }; - 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_frag.h; sourceTree = ""; }; - 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_vert.h; sourceTree = ""; }; - 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_frag.h; sourceTree = ""; }; - 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_vert.h; sourceTree = ""; }; - 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_outline.h; sourceTree = ""; }; - 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_normal.h; sourceTree = ""; }; - 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df.h; sourceTree = ""; }; - 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df_glow.h; sourceTree = ""; }; + 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColorAlphaTest.frag; sourceTree = ""; }; + 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.vert; sourceTree = ""; }; + 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.frag; sourceTree = ""; }; + 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture.vert; sourceTree = ""; }; + 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture_uColor.vert; sourceTree = ""; }; + 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture_uColor.frag; sourceTree = ""; }; + 5034CA05191D591000CE6051 /* ccShader_PositionTexture.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture.frag; sourceTree = ""; }; + 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColorLengthTexture.vert; sourceTree = ""; }; + 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColorLengthTexture.frag; sourceTree = ""; }; + 5034CA08191D591000CE6051 /* ccShader_PositionColor.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColor.vert; sourceTree = ""; }; + 5034CA09191D591000CE6051 /* ccShader_PositionColor.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColor.frag; sourceTree = ""; }; + 5034CA0A191D591000CE6051 /* ccShader_Position_uColor.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Position_uColor.vert; sourceTree = ""; }; + 5034CA0B191D591000CE6051 /* ccShader_Position_uColor.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Position_uColor.frag; sourceTree = ""; }; + 5034CA0C191D591000CE6051 /* ccShader_Label.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label.vert; sourceTree = ""; }; + 5034CA0D191D591000CE6051 /* ccShader_Label_outline.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_outline.frag; sourceTree = ""; }; + 5034CA0E191D591000CE6051 /* ccShader_Label_normal.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_normal.frag; sourceTree = ""; }; + 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df.frag; sourceTree = ""; }; + 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df_glow.frag; sourceTree = ""; }; 5034CA11191D591000CE6051 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = ""; }; @@ -2708,6 +2696,10 @@ 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = ""; }; 5034CA17191D591000CE6051 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; 5034CA18191D591000CE6051 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; + 5034CA60191D91CF00CE6051 /* ccShader_PositionTextureColor.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.vert; sourceTree = ""; }; + 5034CA61191D91CF00CE6051 /* ccShader_PositionTextureColor.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.frag; sourceTree = ""; }; + 5034CA62191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.vert; sourceTree = ""; }; + 5034CA63191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.frag; sourceTree = ""; }; 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = ""; }; 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = ""; }; 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = ""; }; @@ -4649,28 +4641,28 @@ 5034CA5D191D591900CE6051 /* shaders */ = { isa = PBXGroup; children = ( - 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h */, - 5034C9FC191D591000CE6051 /* ccShader_PositionTextureColor_vert.h */, - 5034C9FD191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h */, - 5034C9FE191D591000CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h */, - 5034C9FF191D591000CE6051 /* ccShader_PositionTextureColor_frag.h */, - 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color_vert.h */, - 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color_frag.h */, - 5034CA02191D591000CE6051 /* ccShader_PositionTexture_vert.h */, - 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor_vert.h */, - 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor_frag.h */, - 5034CA05191D591000CE6051 /* ccShader_PositionTexture_frag.h */, - 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture_vert.h */, - 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture_frag.h */, - 5034CA08191D591000CE6051 /* ccShader_PositionColor_vert.h */, - 5034CA09191D591000CE6051 /* ccShader_PositionColor_frag.h */, - 5034CA0A191D591000CE6051 /* ccShader_Position_uColor_vert.h */, - 5034CA0B191D591000CE6051 /* ccShader_Position_uColor_frag.h */, - 5034CA0C191D591000CE6051 /* ccShader_Label_vert.h */, - 5034CA0D191D591000CE6051 /* ccShader_Label_frag_outline.h */, - 5034CA0E191D591000CE6051 /* ccShader_Label_frag_normal.h */, - 5034CA0F191D591000CE6051 /* ccShader_Label_frag_df.h */, - 5034CA10191D591000CE6051 /* ccShader_Label_frag_df_glow.h */, + 5034CA60191D91CF00CE6051 /* ccShader_PositionTextureColor.vert */, + 5034CA61191D91CF00CE6051 /* ccShader_PositionTextureColor.frag */, + 5034CA62191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.vert */, + 5034CA63191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.frag */, + 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */, + 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */, + 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color.frag */, + 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */, + 5034CA05191D591000CE6051 /* ccShader_PositionTexture.frag */, + 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */, + 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */, + 5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture.vert */, + 5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture.frag */, + 5034CA08191D591000CE6051 /* ccShader_PositionColor.vert */, + 5034CA09191D591000CE6051 /* ccShader_PositionColor.frag */, + 5034CA0A191D591000CE6051 /* ccShader_Position_uColor.vert */, + 5034CA0B191D591000CE6051 /* ccShader_Position_uColor.frag */, + 5034CA0C191D591000CE6051 /* ccShader_Label.vert */, + 5034CA0D191D591000CE6051 /* ccShader_Label_outline.frag */, + 5034CA0E191D591000CE6051 /* ccShader_Label_normal.frag */, + 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */, + 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */, ); name = shaders; sourceTree = ""; @@ -4912,7 +4904,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, + 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */, 2AC795E018628723005EC8E1 /* Event.h in Headers */, 2AC795E118628723005EC8E1 /* EventData.h in Headers */, @@ -4923,7 +4915,7 @@ 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */, 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */, - 5034CA3F191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */, + 5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 500DC8B419105D41007B91BF /* CCGroupCommand.h in Headers */, 500DC8D319105F7D007B91BF /* CCAffineTransform.h in Headers */, 46A170191807CBFC005B8026 /* CCCommon.h in Headers */, @@ -4961,7 +4953,7 @@ 1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */, 50FCEBB518C72017004AD434 /* SliderReader.h in Headers */, - 5034CA3B191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */, + 5034CA3B191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, @@ -4969,7 +4961,6 @@ 500DC94E19106300007B91BF /* CCEvent.h in Headers */, 1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */, - 5034CA23191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */, 296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, 1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */, 1A570087180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, @@ -4999,7 +4990,7 @@ 500DC98219106300007B91BF /* ccMacros.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, - 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */, + 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */, 500DC8C619105D41007B91BF /* CCRenderer.h in Headers */, 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */, @@ -5012,7 +5003,7 @@ 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */, 1A5701A7180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, 1A5701B3180BCB590088DEC7 /* CCFontFNT.h in Headers */, - 5034CA47191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */, + 5034CA47191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, 1A5701B7180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, 500DC94219106300007B91BF /* CCData.h in Headers */, 1A5701BB180BCB5A0088DEC7 /* CCLabel.h in Headers */, @@ -5020,7 +5011,7 @@ 1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 500DC93A19106300007B91BF /* CCConfiguration.h in Headers */, 1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, - 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, + 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 1A5701CD180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, 1A5701E0180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E4180BCB8C0088DEC7 /* CCScene.h in Headers */, @@ -5041,11 +5032,11 @@ 500DC99E19106300007B91BF /* CCValue.h in Headers */, 1A01C69618F57BE800EFE3A6 /* CCInteger.h in Headers */, 1A570223180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, - 5034CA43191D591100CE6051 /* ccShader_Label_vert.h in Headers */, + 5034CA43191D591100CE6051 /* ccShader_Label.vert in Headers */, 1A570227180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022B180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, - 5034CA2F191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */, - 5034CA4B191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */, + 5034CA2F191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */, + 5034CA4B191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, 500DC96A19106300007B91BF /* CCEventListenerCustom.h in Headers */, B2AF2F9718EBAEAE00C5807C /* MathUtil.h in Headers */, @@ -5053,19 +5044,19 @@ 500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */, 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */, 500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */, - 5034CA49191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */, + 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 500DC9A019106300007B91BF /* CCVector.h in Headers */, 500DC92C19106300007B91BF /* atitc.h in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, 500DC98419106300007B91BF /* CCMap.h in Headers */, 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */, 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */, - 5034CA3D191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */, + 5034CA3D191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570284180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, 500DC9A419106300007B91BF /* etc1.h in Headers */, 5034CA55191D591100CE6051 /* CCGLProgramState.h in Headers */, - 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */, + 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */, 1A570288180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, 1A57028C180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */, 5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */, @@ -5080,7 +5071,6 @@ 1A5702C0180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */, 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */, 1A5702C4180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */, - 5034CA25191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */, 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, 1A5702D5180BCE570088DEC7 /* CCTexture2D.h in Headers */, @@ -5091,7 +5081,7 @@ 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */, 1A5702F4180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 1A5702F8180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, - 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, + 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, 1A5702FC180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */, 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */, 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, @@ -5123,12 +5113,11 @@ 1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */, 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */, 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */, - 5034CA29191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */, - 5034CA35191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */, + 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, 500DC98019106300007B91BF /* CCEventType.h in Headers */, 1AD71DBF180E26E600808F54 /* CCBSequence.h in Headers */, 1AD71DC3180E26E600808F54 /* CCBSequenceProperty.h in Headers */, - 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */, + 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, 1AD71DCB180E26E600808F54 /* CCControlButtonLoader.h in Headers */, 1AD71DCF180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, @@ -5179,10 +5168,9 @@ 500DC8D919105F7D007B91BF /* CCMathBase.h in Headers */, 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */, 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */, - 5034CA27191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */, 1AD71ECF180E26E600808F54 /* Skeleton.h in Headers */, - 5034CA41191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */, + 5034CA41191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, 1A01C69E18F57BE800EFE3A6 /* CCString.h in Headers */, 500DC9B819106E6D007B91BF /* TransformUtils.h in Headers */, 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */, @@ -5225,7 +5213,7 @@ 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */, 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */, - 5034CA45191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */, + 5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */, 500DC96219106300007B91BF /* CCEventListener.h in Headers */, 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */, 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */, @@ -5242,7 +5230,7 @@ 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */, 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */, - 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */, + 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */, 5034CA1D191D591100CE6051 /* CCShaderCache.h in Headers */, 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, @@ -5419,7 +5407,7 @@ 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */, 46A1703F1807CC07005B8026 /* CCDirectorCaller.h in Headers */, 46A170381807CBFE005B8026 /* CCSAXParser.h in Headers */, - 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, + 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 500DC97319106300007B91BF /* CCEventListenerMouse.h in Headers */, 500DC99319106300007B91BF /* CCRefPtr.h in Headers */, 46A1702E1807CBFE005B8026 /* CCDevice.h in Headers */, @@ -5442,9 +5430,8 @@ 46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */, 46A170431807CC07005B8026 /* CCES2Renderer.h in Headers */, 46A170331807CBFE005B8026 /* CCImage.h in Headers */, - 5034CA40191D591100CE6051 /* ccShader_Position_uColor_vert.h in Headers */, + 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */, - 5034CA28191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */, 46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */, 46A1702C1807CBFE005B8026 /* CCApplicationProtocol.h in Headers */, @@ -5454,11 +5441,11 @@ 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, - 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, + 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, 1A570070180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570074180BC5A10088DEC7 /* CCActionGrid.h in Headers */, B37510841823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */, - 5034CA46191D591100CE6051 /* ccShader_Label_frag_outline.h in Headers */, + 5034CA46191D591100CE6051 /* ccShader_Label_outline.frag in Headers */, 1A570078180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A01C68918F57BE800EFE3A6 /* CCBool.h in Headers */, 1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */, @@ -5480,7 +5467,7 @@ 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */, 2905FA7318CF08D100240AA3 /* UIScrollInterface.h in Headers */, 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */, - 5034CA30191D591100CE6051 /* ccShader_PositionTexture_vert.h in Headers */, + 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */, 500DC93119106300007B91BF /* base64.h in Headers */, B2AF2FA018EBAEAE00C5807C /* Quaternion.h in Headers */, 50E6D33718E174130051CA34 /* UIHBox.h in Headers */, @@ -5496,7 +5483,7 @@ 500DC8C719105D41007B91BF /* CCRenderer.h in Headers */, 500DC98519106300007B91BF /* CCMap.h in Headers */, 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */, - 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color_frag.h in Headers */, + 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, @@ -5505,14 +5492,14 @@ 1A5701B8180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, 1A5701BC180BCB5A0088DEC7 /* CCLabel.h in Headers */, 1A5701C0180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */, - 5034CA42191D591100CE6051 /* ccShader_Position_uColor_frag.h in Headers */, + 5034CA42191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, 500DC97719106300007B91BF /* CCEventListenerTouch.h in Headers */, 500DC93F19106300007B91BF /* CCConsole.h in Headers */, 1A5701C4180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */, - 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, + 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, 1A5701CE180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, 296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */, 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */, @@ -5527,7 +5514,7 @@ 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */, 1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, 1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */, - 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor_frag.h in Headers */, + 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, 1A57020B180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */, 1A570213180BCBF40088DEC7 /* CCProgressTimer.h in Headers */, B37510821823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */, @@ -5540,16 +5527,14 @@ 1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, - 5034CA24191D591100CE6051 /* ccShader_PositionTextureColor_vert.h in Headers */, - 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color_vert.h in Headers */, + 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */, 1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */, - 5034CA26191D591100CE6051 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, 500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */, 500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */, 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */, 500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */, - 5034CA4A191D591100CE6051 /* ccShader_Label_frag_df.h in Headers */, + 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 500DC99119106300007B91BF /* CCRef.h in Headers */, 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570285180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, @@ -5576,7 +5561,7 @@ 1A5702ED180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 500DC99F19106300007B91BF /* CCValue.h in Headers */, 1A5702F1180BCE750088DEC7 /* CCTMXLayer.h in Headers */, - 5034CA44191D591100CE6051 /* ccShader_Label_vert.h in Headers */, + 5034CA44191D591100CE6051 /* ccShader_Label.vert in Headers */, 1A5702F5180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 1A5702F9180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, 500DC9A119106300007B91BF /* CCVector.h in Headers */, @@ -5602,11 +5587,11 @@ 1A570357180BD0B00088DEC7 /* ioapi.h in Headers */, 1A01C69B18F57BE800EFE3A6 /* CCSet.h in Headers */, 1A57035B180BD0B00088DEC7 /* unzip.h in Headers */, - 5034CA48191D591100CE6051 /* ccShader_Label_frag_normal.h in Headers */, + 5034CA48191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, 1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */, 1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */, 1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */, - 5034CA3E191D591100CE6051 /* ccShader_PositionColor_frag.h in Headers */, + 5034CA3E191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */, 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */, @@ -5616,9 +5601,9 @@ 1AD71DCC180E26E600808F54 /* CCControlButtonLoader.h in Headers */, 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, - 5034CA3C191D591100CE6051 /* ccShader_PositionColor_vert.h in Headers */, + 5034CA3C191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 46C02E0A18E91123004B7456 /* xxhash.h in Headers */, - 5034CA4C191D591100CE6051 /* ccShader_Label_frag_df_glow.h in Headers */, + 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, 50E6D33B18E174130051CA34 /* UIRelativeBox.h in Headers */, 1AD71DD8180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, 1AD71DDC180E26E600808F54 /* CCLayerColorLoader.h in Headers */, @@ -5635,7 +5620,6 @@ 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */, 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */, - 5034CA2A191D591100CE6051 /* ccShader_PositionTextureColor_frag.h in Headers */, 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */, @@ -5655,7 +5639,7 @@ 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */, 500DC96719106300007B91BF /* CCEventListenerAcceleration.h in Headers */, 1AD71EB0180E26E600808F54 /* AttachmentLoader.h in Headers */, - 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor_vert.h in Headers */, + 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, 1AD71EB4180E26E600808F54 /* Bone.h in Headers */, 1AD71EB8180E26E600808F54 /* BoneData.h in Headers */, 06CAAACA186AD7EF0012A414 /* TriggerMng.h in Headers */, @@ -5697,7 +5681,7 @@ 500DC99B19106300007B91BF /* ccTypes.h in Headers */, 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, - 5034CA36191D591100CE6051 /* ccShader_PositionTexture_frag.h in Headers */, + 5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, 5034CA56191D591100CE6051 /* CCGLProgramState.h in Headers */, 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, 2905FA4D18CF08D100240AA3 /* UICheckBox.h in Headers */, diff --git a/cocos/renderer/ccShader_PositionTexture_frag.h b/cocos/renderer/ccShader_Label.vert similarity index 75% rename from cocos/renderer/ccShader_PositionTexture_frag.h rename to cocos/renderer/ccShader_Label.vert index 93a8f0eda6..02b3790504 100644 --- a/cocos/renderer/ccShader_PositionTexture_frag.h +++ b/cocos/renderer/ccShader_Label.vert @@ -23,16 +23,24 @@ * THE SOFTWARE. */ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = texture2D(CC_Texture0, v_texCoord); \n\ -} \n\ -"; +const char* ccLabel_vert = STRINGIFY( + +attribute vec4 a_position; +attribute vec2 a_texCoord; +attribute vec4 a_color; + +#ifdef GL_ES +varying lowp vec4 v_fragmentColor; +varying mediump vec2 v_texCoord; +#else +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +#endif + +void main() +{ + gl_Position = CC_MVPMatrix * a_position; + v_fragmentColor = a_color; + v_texCoord = a_texCoord; +} +); diff --git a/cocos/renderer/ccShader_Label_df.frag b/cocos/renderer/ccShader_Label_df.frag new file mode 100644 index 0000000000..31c9ec0336 --- /dev/null +++ b/cocos/renderer/ccShader_Label_df.frag @@ -0,0 +1,26 @@ +const char* ccLabelDistanceFieldNormal_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; +uniform vec4 v_textColor; + +void main() +{ + vec4 color = texture2D(CC_Texture0, v_texCoord); + //the texture use dual channel 16-bit output for distance_map + //float dist = color.b+color.g/256.0; + // the texture use single channel 8-bit output for distance_map + float dist = color.a; + //todo:Implementation 'fwidth' for glsl 1.0 + //float width = fwidth(dist); + //assign width for constant will lead to a little bit fuzzy,it's temporary measure. + float width = 0.04; + float alpha = smoothstep(0.5-width, 0.5+width, dist) * v_textColor.a; + gl_FragColor = v_fragmentColor * vec4(v_textColor.rgb,alpha); +} +); diff --git a/cocos/renderer/ccShader_Label_df_glow.frag b/cocos/renderer/ccShader_Label_df_glow.frag new file mode 100644 index 0000000000..9d6ab500af --- /dev/null +++ b/cocos/renderer/ccShader_Label_df_glow.frag @@ -0,0 +1,26 @@ +const char* ccLabelDistanceFieldGlow_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; +uniform vec4 v_effectColor; +uniform vec4 v_textColor; + +void main() +{ + float dist = texture2D(CC_Texture0, v_texCoord).a; + //todo:Implementation 'fwidth' for glsl 1.0 + //float width = fwidth(dist); + //assign width for constant will lead to a little bit fuzzy,it's temporary measure. + float width = 0.04; + float alpha = smoothstep(0.5-width, 0.5+width, dist); + //glow + float mu = smoothstep(0.5, 1.0, sqrt(dist)); + vec4 color = v_effectColor*(1.0-alpha) + v_textColor*alpha; + gl_FragColor = v_fragmentColor * vec4(color.rgb, max(alpha,mu)*color.a); +} +); diff --git a/cocos/renderer/ccShader_Label_frag_df.h b/cocos/renderer/ccShader_Label_frag_df.h deleted file mode 100644 index 30ff80cdc4..0000000000 --- a/cocos/renderer/ccShader_Label_frag_df.h +++ /dev/null @@ -1,25 +0,0 @@ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ -uniform vec4 v_textColor; \n\ - \n\ -void main() \n\ -{ \n\ - vec4 color = texture2D(CC_Texture0, v_texCoord); \n\ - //the texture use dual channel 16-bit output for distance_map \n\ - //float dist = color.b+color.g/256.0; \n\ - // the texture use single channel 8-bit output for distance_map \n\ - float dist = color.a; \n\ - //todo:Implementation 'fwidth' for glsl 1.0 \n\ - //float width = fwidth(dist); \n\ - //assign width for constant will lead to a little bit fuzzy,it's temporary measure.\n\ - float width = 0.04; \n\ - float alpha = smoothstep(0.5-width, 0.5+width, dist) * v_textColor.a; \n\ - gl_FragColor = v_fragmentColor * vec4(v_textColor.rgb,alpha); \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_Label_frag_df_glow.h b/cocos/renderer/ccShader_Label_frag_df_glow.h deleted file mode 100644 index d481f4c0b7..0000000000 --- a/cocos/renderer/ccShader_Label_frag_df_glow.h +++ /dev/null @@ -1,25 +0,0 @@ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ -uniform vec4 v_effectColor; \n\ -uniform vec4 v_textColor; \n\ - \n\ -void main() \n\ -{ \n\ - float dist = texture2D(CC_Texture0, v_texCoord).a; \n\ - //todo:Implementation 'fwidth' for glsl 1.0 \n\ - //float width = fwidth(dist); \n\ - //assign width for constant will lead to a little bit fuzzy,it's temporary measure.\n\ - float width = 0.04; \n\ - float alpha = smoothstep(0.5-width, 0.5+width, dist); \n\ - //glow \n\ - float mu = smoothstep(0.5, 1.0, sqrt(dist)); \n\ - vec4 color = v_effectColor*(1.0-alpha) + v_textColor*alpha; \n\ - gl_FragColor = v_fragmentColor * vec4(color.rgb, max(alpha,mu)*color.a); \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_Label_frag_normal.h b/cocos/renderer/ccShader_Label_frag_normal.h deleted file mode 100644 index 26623a3024..0000000000 --- a/cocos/renderer/ccShader_Label_frag_normal.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ -uniform vec4 v_textColor; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = v_fragmentColor * vec4( v_textColor.rgb, // RGB from uniform \n\ - v_textColor.a * texture2D(CC_Texture0, v_texCoord).a // A from texture & uniform \n\ - ); \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_Label_frag_outline.h b/cocos/renderer/ccShader_Label_frag_outline.h deleted file mode 100644 index ca3972a474..0000000000 --- a/cocos/renderer/ccShader_Label_frag_outline.h +++ /dev/null @@ -1,25 +0,0 @@ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ -uniform vec4 v_effectColor; \n\ -uniform vec4 v_textColor; \n\ - \n\ -void main() \n\ -{ \n\ - vec4 sample = texture2D(CC_Texture0, v_texCoord); \n\ - float fontAlpha = sample.a; \n\ - float outlineAlpha = sample.r; \n\ - if (outlineAlpha > 0.0){ \n\ - vec4 color = v_textColor * fontAlpha + v_effectColor * (1.0 - fontAlpha);\n\ - gl_FragColor = v_fragmentColor * vec4( color.rgb,max(fontAlpha,outlineAlpha)*color.a); \n\ - } \n\ - else { \n\ - discard; \n\ - } \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_Label_normal.frag b/cocos/renderer/ccShader_Label_normal.frag new file mode 100644 index 0000000000..0d4d2788d1 --- /dev/null +++ b/cocos/renderer/ccShader_Label_normal.frag @@ -0,0 +1,42 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccLabelNormal_frag = STRINGIFY( +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; +uniform vec4 v_textColor; + +void main() +{ + gl_FragColor = v_fragmentColor * vec4( v_textColor.rgb,// RGB from uniform + v_textColor.a * texture2D(CC_Texture0, v_texCoord).a// A from texture & uniform + ); +} +); diff --git a/cocos/renderer/ccShader_Label_outline.frag b/cocos/renderer/ccShader_Label_outline.frag new file mode 100644 index 0000000000..967f83c0b9 --- /dev/null +++ b/cocos/renderer/ccShader_Label_outline.frag @@ -0,0 +1,25 @@ +const char* ccLabelOutline_frag = STRINGIFY( +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; +uniform vec4 v_effectColor; +uniform vec4 v_textColor; + +void main() +{ + vec4 sample = texture2D(CC_Texture0, v_texCoord); + float fontAlpha = sample.a; + float outlineAlpha = sample.r; + if (outlineAlpha > 0.0){ + vec4 color = v_textColor * fontAlpha + v_effectColor * (1.0 - fontAlpha); + gl_FragColor = v_fragmentColor * vec4( color.rgb,max(fontAlpha,outlineAlpha)*color.a); + } + else { + discard; + } +} +); diff --git a/cocos/renderer/ccShader_Label_vert.h b/cocos/renderer/ccShader_Label_vert.h deleted file mode 100644 index f509caf016..0000000000 --- a/cocos/renderer/ccShader_Label_vert.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -attribute vec4 a_position; \n\ -attribute vec2 a_texCoord; \n\ -attribute vec4 a_color; \n\ - \n\ -#ifdef GL_ES \n\ -varying lowp vec4 v_fragmentColor; \n\ -varying mediump vec2 v_texCoord; \n\ -#else \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ - v_fragmentColor = a_color; \n\ - v_texCoord = a_texCoord; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_Position_uColor_frag.h b/cocos/renderer/ccShader_PositionColor.frag similarity index 83% rename from cocos/renderer/ccShader_Position_uColor_frag.h rename to cocos/renderer/ccShader_PositionColor.frag index d882c88f76..a42854f1fb 100644 --- a/cocos/renderer/ccShader_Position_uColor_frag.h +++ b/cocos/renderer/ccShader_PositionColor.frag @@ -23,15 +23,16 @@ * THE SOFTWARE. */ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = v_fragmentColor; \n\ -} \n\ -"; +const char* ccPositionColor_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; + +void main() +{ + gl_FragColor = v_fragmentColor; +} +); diff --git a/cocos/renderer/ccShader_PositionTextureColor_noMVP_frag.h b/cocos/renderer/ccShader_PositionColor.vert similarity index 76% rename from cocos/renderer/ccShader_PositionTextureColor_noMVP_frag.h rename to cocos/renderer/ccShader_PositionColor.vert index df5527ef56..fd1694df4e 100644 --- a/cocos/renderer/ccShader_PositionTextureColor_noMVP_frag.h +++ b/cocos/renderer/ccShader_PositionColor.vert @@ -23,17 +23,20 @@ * THE SOFTWARE. */ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); \n\ -} \n\ -"; +const char* ccPositionColor_vert = STRINGIFY( + +attribute vec4 a_position; +attribute vec4 a_color; + +#ifdef GL_ES +varying lowp vec4 v_fragmentColor; +#else +varying vec4 v_fragmentColor; +#endif + +void main() +{ + gl_Position = CC_MVPMatrix * a_position; + v_fragmentColor = a_color; +} +); diff --git a/cocos/renderer/ccShader_PositionColorLengthTexture.frag b/cocos/renderer/ccShader_PositionColorLengthTexture.frag new file mode 100644 index 0000000000..e47ebf20c3 --- /dev/null +++ b/cocos/renderer/ccShader_PositionColorLengthTexture.frag @@ -0,0 +1,42 @@ +/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +const char* ccPositionColorLengthTexture_frag = STRINGIFY( + +#ifdef GL_ES +// #extension GL_OES_standard_derivatives : enable + +varying mediump vec4 v_color; +varying mediump vec2 v_texcoord; +#else +varying vec4 v_color; +varying vec2 v_texcoord; +#endif + +void main() +{ +// #if defined GL_OES_standard_derivatives +// gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord)); +// #else + gl_FragColor = v_color*step(0.0, 1.0 - length(v_texcoord)); +// #endif +} +); diff --git a/cocos/renderer/ccShader_PositionColorLengthTexture.vert b/cocos/renderer/ccShader_PositionColorLengthTexture.vert new file mode 100644 index 0000000000..0693b74659 --- /dev/null +++ b/cocos/renderer/ccShader_PositionColorLengthTexture.vert @@ -0,0 +1,49 @@ +/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +const char* ccPositionColorLengthTexture_vert = STRINGIFY( + +#ifdef GL_ES +attribute mediump vec4 a_position; +attribute mediump vec2 a_texcoord; +attribute mediump vec4 a_color; + +varying mediump vec4 v_color; +varying mediump vec2 v_texcoord; + +#else + +attribute vec4 a_position; +attribute vec2 a_texcoord; +attribute vec4 a_color; + +varying vec4 v_color; +varying vec2 v_texcoord; +#endif + +void main() +{ + v_color = vec4(a_color.rgb * a_color.a, a_color.a); + v_texcoord = a_texcoord; + + gl_Position = CC_MVPMatrix * a_position; +} +); diff --git a/cocos/renderer/ccShader_PositionColorLengthTexture_frag.h b/cocos/renderer/ccShader_PositionColorLengthTexture_frag.h deleted file mode 100644 index 803664a506..0000000000 --- a/cocos/renderer/ccShader_PositionColorLengthTexture_frag.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -" \n\ -#ifdef GL_ES \n\ -// #extension GL_OES_standard_derivatives : enable \n\ - \n\ -varying mediump vec4 v_color; \n\ -varying mediump vec2 v_texcoord; \n\ -#else \n\ -varying vec4 v_color; \n\ -varying vec2 v_texcoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ -// #if defined GL_OES_standard_derivatives \n\ - // gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord)); \n\ -// #else \n\ - gl_FragColor = v_color*step(0.0, 1.0 - length(v_texcoord)); \n\ -// #endif \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionColorLengthTexture_vert.h b/cocos/renderer/ccShader_PositionColorLengthTexture_vert.h deleted file mode 100644 index 3a8e96d467..0000000000 --- a/cocos/renderer/ccShader_PositionColorLengthTexture_vert.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -" \n\ -#ifdef GL_ES \n\ -attribute mediump vec4 a_position; \n\ -attribute mediump vec2 a_texcoord; \n\ -attribute mediump vec4 a_color; \n\ - \n\ -varying mediump vec4 v_color; \n\ -varying mediump vec2 v_texcoord; \n\ - \n\ -#else \n\ -attribute vec4 a_position; \n\ -attribute vec2 a_texcoord; \n\ -attribute vec4 a_color; \n\ - \n\ -varying vec4 v_color; \n\ -varying vec2 v_texcoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - v_color = vec4(a_color.rgb * a_color.a, a_color.a); \n\ - v_texcoord = a_texcoord; \n\ - \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionColor_frag.h b/cocos/renderer/ccShader_PositionTexture.frag similarity index 81% rename from cocos/renderer/ccShader_PositionColor_frag.h rename to cocos/renderer/ccShader_PositionTexture.frag index 910903d2e7..bb072775bd 100644 --- a/cocos/renderer/ccShader_PositionColor_frag.h +++ b/cocos/renderer/ccShader_PositionTexture.frag @@ -23,15 +23,17 @@ * THE SOFTWARE. */ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = v_fragmentColor; \n\ -} \n\ -"; +const char* ccPositionTexture_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; + +void main() +{ + gl_FragColor = texture2D(CC_Texture0, v_texCoord); +} +); diff --git a/cocos/renderer/ccShader_PositionTextureColor_frag.h b/cocos/renderer/ccShader_PositionTexture.vert similarity index 76% rename from cocos/renderer/ccShader_PositionTextureColor_frag.h rename to cocos/renderer/ccShader_PositionTexture.vert index df5527ef56..288e860505 100644 --- a/cocos/renderer/ccShader_PositionTextureColor_frag.h +++ b/cocos/renderer/ccShader_PositionTexture.vert @@ -23,17 +23,20 @@ * THE SOFTWARE. */ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); \n\ -} \n\ -"; +const char* ccPositionTexture_vert = STRINGIFY( + +attribute vec4 a_position; +attribute vec2 a_texCoord; + +#ifdef GL_ES +varying mediump vec2 v_texCoord; +#else +varying vec2 v_texCoord; +#endif + +void main() +{ + gl_Position = CC_MVPMatrix * a_position; + v_texCoord = a_texCoord; +} +); \ No newline at end of file diff --git a/cocos/renderer/ccShader_PositionTexture_uColor_frag.h b/cocos/renderer/ccShader_PositionTextureA8Color.frag similarity index 76% rename from cocos/renderer/ccShader_PositionTexture_uColor_frag.h rename to cocos/renderer/ccShader_PositionTextureA8Color.frag index a97d25077e..6c5e6cdd0a 100644 --- a/cocos/renderer/ccShader_PositionTexture_uColor_frag.h +++ b/cocos/renderer/ccShader_PositionTextureA8Color.frag @@ -23,19 +23,20 @@ * THE SOFTWARE. */ -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -uniform vec4 u_color; \n\ - \n\ -varying vec2 v_texCoord; \n\ - \n\ -uniform sampler2D CC_Texture0; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = texture2D(CC_Texture0, v_texCoord) * u_color; \n\ -} \n\ -"; +const char* ccPositionTextureA8Color_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; + +void main() +{ + gl_FragColor = vec4( v_fragmentColor.rgb,// RGB from uniform + v_fragmentColor.a * texture2D(CC_Texture0, v_texCoord).a // A from texture & uniform + ); +} +); diff --git a/cocos/renderer/ccShader_PositionTextureA8Color.vert b/cocos/renderer/ccShader_PositionTextureA8Color.vert new file mode 100644 index 0000000000..a4d8a833d1 --- /dev/null +++ b/cocos/renderer/ccShader_PositionTextureA8Color.vert @@ -0,0 +1,46 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPositionTextureA8Color_vert = STRINGIFY( + +attribute vec4 a_position; +attribute vec2 a_texCoord; +attribute vec4 a_color; + +#ifdef GL_ES +varying lowp vec4 v_fragmentColor; +varying mediump vec2 v_texCoord; +#else +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +#endif + +void main() +{ + gl_Position = CC_MVPMatrix * a_position; + v_fragmentColor = a_color; + v_texCoord = a_texCoord; +} +); diff --git a/cocos/renderer/ccShader_PositionTextureA8Color_frag.h b/cocos/renderer/ccShader_PositionTextureA8Color_frag.h deleted file mode 100644 index 6a8fb85ae1..0000000000 --- a/cocos/renderer/ccShader_PositionTextureA8Color_frag.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ - \n\ -void main() \n\ -{ \n\ - gl_FragColor = vec4( v_fragmentColor.rgb, // RGB from uniform \n\ - v_fragmentColor.a * texture2D(CC_Texture0, v_texCoord).a // A from texture & uniform \n\ - ); \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionTextureA8Color_vert.h b/cocos/renderer/ccShader_PositionTextureA8Color_vert.h deleted file mode 100644 index bb29e7d93a..0000000000 --- a/cocos/renderer/ccShader_PositionTextureA8Color_vert.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -attribute vec4 a_position; \n\ -attribute vec2 a_texCoord; \n\ -attribute vec4 a_color; \n\ - \n\ -#ifdef GL_ES \n\ -varying lowp vec4 v_fragmentColor; \n\ -varying mediump vec2 v_texCoord; \n\ -#else \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ - v_fragmentColor = a_color; \n\ - v_texCoord = a_texCoord; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionTextureColor.frag b/cocos/renderer/ccShader_PositionTextureColor.frag new file mode 100644 index 0000000000..d31c530775 --- /dev/null +++ b/cocos/renderer/ccShader_PositionTextureColor.frag @@ -0,0 +1,39 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPositionTextureColor_frag = STRINGIFY( +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; + +void main() +{ + gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); +} +); diff --git a/cocos/renderer/ccShader_PositionTextureColor.vert b/cocos/renderer/ccShader_PositionTextureColor.vert new file mode 100644 index 0000000000..1c3128eece --- /dev/null +++ b/cocos/renderer/ccShader_PositionTextureColor.vert @@ -0,0 +1,46 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPositionTextureColor_vert = STRINGIFY( +attribute vec4 a_position; +attribute vec2 a_texCoord; +attribute vec4 a_color; + +#ifdef GL_ES +varying lowp vec4 v_fragmentColor; +varying mediump vec2 v_texCoord; +#else +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +#endif + +void main() +{ + gl_Position = CC_MVPMatrix * a_position; + v_fragmentColor = a_color; + v_texCoord = a_texCoord; +} +); + diff --git a/cocos/renderer/ccShader_PositionColor_vert.h b/cocos/renderer/ccShader_PositionTextureColorAlphaTest.frag similarity index 66% rename from cocos/renderer/ccShader_PositionColor_vert.h rename to cocos/renderer/ccShader_PositionTextureColorAlphaTest.frag index 633f338a9a..437c181f12 100644 --- a/cocos/renderer/ccShader_PositionColor_vert.h +++ b/cocos/renderer/ccShader_PositionTextureColorAlphaTest.frag @@ -1,8 +1,7 @@ /* * cocos2d for iPhone: http://www.cocos2d-iphone.org * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. + * Copyright (c) 2011 Brian Chapados * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,18 +22,27 @@ * THE SOFTWARE. */ -" \n\ -attribute vec4 a_position; \n\ -attribute vec4 a_color; \n\ -#ifdef GL_ES \n\ -varying lowp vec4 v_fragmentColor; \n\ -#else \n\ -varying vec4 v_fragmentColor; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ - v_fragmentColor = a_color; \n\ -} \n\ -"; +const char* ccPositionTextureColorAlphaTest_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; +uniform float CC_alpha_value; + +void main() +{ + vec4 texColor = texture2D(CC_Texture0, v_texCoord); + +// mimic: glAlphaFunc(GL_GREATER) +// pass if ( incoming_pixel >= CC_alpha_value ) => fail if incoming_pixel < CC_alpha_value + + if ( texColor.a <= CC_alpha_value ) + discard; + + gl_FragColor = texColor * v_fragmentColor; +} +); diff --git a/cocos/renderer/ccShader_PositionTextureColorAlphaTest_frag.h b/cocos/renderer/ccShader_PositionTextureColorAlphaTest_frag.h deleted file mode 100644 index fe321ba222..0000000000 --- a/cocos/renderer/ccShader_PositionTextureColorAlphaTest_frag.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Brian Chapados - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -#ifdef GL_ES \n\ -precision lowp float; \n\ -#endif \n\ - \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -uniform sampler2D CC_Texture0; \n\ -uniform float CC_alpha_value; \n\ - \n\ -void main() \n\ -{ \n\ - vec4 texColor = texture2D(CC_Texture0, v_texCoord); \n\ - \n\ - // mimic: glAlphaFunc(GL_GREATER) \n\ - // pass if ( incoming_pixel >= CC_alpha_value ) => fail if incoming_pixel < CC_alpha_value \n\ - \n\ - if ( texColor.a <= CC_alpha_value ) \n\ - discard; \n\ - \n\ - gl_FragColor = texColor * v_fragmentColor; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionTextureColor_noMVP.frag b/cocos/renderer/ccShader_PositionTextureColor_noMVP.frag new file mode 100644 index 0000000000..cd37da4233 --- /dev/null +++ b/cocos/renderer/ccShader_PositionTextureColor_noMVP.frag @@ -0,0 +1,40 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPositionTextureColor_noMVP_frag = STRINGIFY( +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +uniform sampler2D CC_Texture0; + +void main() +{ + gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); +} +); + diff --git a/cocos/renderer/ccShader_PositionTextureColor_noMVP.vert b/cocos/renderer/ccShader_PositionTextureColor_noMVP.vert new file mode 100644 index 0000000000..9b5a226c1c --- /dev/null +++ b/cocos/renderer/ccShader_PositionTextureColor_noMVP.vert @@ -0,0 +1,45 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPositionTextureColor_noMVP_vert = STRINGIFY( +attribute vec4 a_position; +attribute vec2 a_texCoord; +attribute vec4 a_color; + +#ifdef GL_ES +varying lowp vec4 v_fragmentColor; +varying mediump vec2 v_texCoord; +#else +varying vec4 v_fragmentColor; +varying vec2 v_texCoord; +#endif + +void main() +{ + gl_Position = CC_PMatrix * a_position; + v_fragmentColor = a_color; + v_texCoord = a_texCoord; +} +); diff --git a/cocos/renderer/ccShader_PositionTextureColor_noMVP_vert.h b/cocos/renderer/ccShader_PositionTextureColor_noMVP_vert.h deleted file mode 100644 index f2d39c3c10..0000000000 --- a/cocos/renderer/ccShader_PositionTextureColor_noMVP_vert.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -attribute vec4 a_position; \n\ -attribute vec2 a_texCoord; \n\ -attribute vec4 a_color; \n\ - \n\ -#ifdef GL_ES \n\ -varying lowp vec4 v_fragmentColor; \n\ -varying mediump vec2 v_texCoord; \n\ -#else \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_PMatrix * a_position; \n\ - v_fragmentColor = a_color; \n\ - v_texCoord = a_texCoord; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionTextureColor_vert.h b/cocos/renderer/ccShader_PositionTextureColor_vert.h deleted file mode 100644 index bb29e7d93a..0000000000 --- a/cocos/renderer/ccShader_PositionTextureColor_vert.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -attribute vec4 a_position; \n\ -attribute vec2 a_texCoord; \n\ -attribute vec4 a_color; \n\ - \n\ -#ifdef GL_ES \n\ -varying lowp vec4 v_fragmentColor; \n\ -varying mediump vec2 v_texCoord; \n\ -#else \n\ -varying vec4 v_fragmentColor; \n\ -varying vec2 v_texCoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ - v_fragmentColor = a_color; \n\ - v_texCoord = a_texCoord; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionTexture_uColor.frag b/cocos/renderer/ccShader_PositionTexture_uColor.frag new file mode 100644 index 0000000000..8b13f64bab --- /dev/null +++ b/cocos/renderer/ccShader_PositionTexture_uColor.frag @@ -0,0 +1,42 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPositionTexture_uColor_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +uniform vec4 u_color; + +varying vec2 v_texCoord; + +uniform sampler2D CC_Texture0; + +void main() +{ + gl_FragColor = texture2D(CC_Texture0, v_texCoord) * u_color; +} +); diff --git a/cocos/renderer/ccShader_PositionTexture_uColor.vert b/cocos/renderer/ccShader_PositionTexture_uColor.vert new file mode 100644 index 0000000000..d24fbd61f8 --- /dev/null +++ b/cocos/renderer/ccShader_PositionTexture_uColor.vert @@ -0,0 +1,42 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPositionTexture_uColor_vert = STRINGIFY( + +attribute vec4 a_position; +attribute vec2 a_texCoord; + +#ifdef GL_ES +varying mediump vec2 v_texCoord; +#else +varying vec2 v_texCoord; +#endif + +void main() +{ + gl_Position = CC_MVPMatrix * a_position; + v_texCoord = a_texCoord; +} +); diff --git a/cocos/renderer/ccShader_PositionTexture_uColor_vert.h b/cocos/renderer/ccShader_PositionTexture_uColor_vert.h deleted file mode 100644 index 9d2bfd3e2d..0000000000 --- a/cocos/renderer/ccShader_PositionTexture_uColor_vert.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -attribute vec4 a_position; \n\ -attribute vec2 a_texCoord; \n\ - \n\ -#ifdef GL_ES \n\ -varying mediump vec2 v_texCoord; \n\ -#else \n\ -varying vec2 v_texCoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ - v_texCoord = a_texCoord; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_PositionTexture_vert.h b/cocos/renderer/ccShader_PositionTexture_vert.h deleted file mode 100644 index 1278ab0e80..0000000000 --- a/cocos/renderer/ccShader_PositionTexture_vert.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -attribute vec4 a_position; \n\ -attribute vec2 a_texCoord; \n\ - \n\ -#ifdef GL_ES \n\ -varying mediump vec2 v_texCoord; \n\ -#else \n\ -varying vec2 v_texCoord; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ - v_texCoord = a_texCoord; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShader_Position_uColor.frag b/cocos/renderer/ccShader_Position_uColor.frag new file mode 100644 index 0000000000..268e36ec7d --- /dev/null +++ b/cocos/renderer/ccShader_Position_uColor.frag @@ -0,0 +1,38 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPosition_uColor_frag = STRINGIFY( + +#ifdef GL_ES +precision lowp float; +#endif + +varying vec4 v_fragmentColor; + +void main() +{ + gl_FragColor = v_fragmentColor; +} +); diff --git a/cocos/renderer/ccShader_Position_uColor.vert b/cocos/renderer/ccShader_Position_uColor.vert new file mode 100644 index 0000000000..63301dc1b6 --- /dev/null +++ b/cocos/renderer/ccShader_Position_uColor.vert @@ -0,0 +1,44 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * + * Copyright (c) 2011 Ricardo Quesada + * Copyright (c) 2012 Zynga Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +const char* ccPosition_uColor_vert = STRINGIFY( + +attribute vec4 a_position; +uniform vec4 u_color; +uniform float u_pointSize; + +#ifdef GL_ES +varying lowp vec4 v_fragmentColor; +#else +varying vec4 v_fragmentColor; +#endif + +void main() +{ + gl_Position = CC_MVPMatrix * a_position; + gl_PointSize = u_pointSize; + v_fragmentColor = u_color; +} +); diff --git a/cocos/renderer/ccShader_Position_uColor_vert.h b/cocos/renderer/ccShader_Position_uColor_vert.h deleted file mode 100644 index c50e38b3f8..0000000000 --- a/cocos/renderer/ccShader_Position_uColor_vert.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2011 Ricardo Quesada - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -" \n\ -attribute vec4 a_position; \n\ -uniform vec4 u_color; \n\ -uniform float u_pointSize; \n\ - \n\ -#ifdef GL_ES \n\ -varying lowp vec4 v_fragmentColor; \n\ -#else \n\ -varying vec4 v_fragmentColor; \n\ -#endif \n\ - \n\ -void main() \n\ -{ \n\ - gl_Position = CC_MVPMatrix * a_position; \n\ - gl_PointSize = u_pointSize; \n\ - v_fragmentColor = u_color; \n\ -} \n\ -"; diff --git a/cocos/renderer/ccShaders.cpp b/cocos/renderer/ccShaders.cpp index af48caa9fd..4f825e9c75 100644 --- a/cocos/renderer/ccShaders.cpp +++ b/cocos/renderer/ccShaders.cpp @@ -26,71 +26,48 @@ THE SOFTWARE. #include "renderer/ccShaders.h" +#define STRINGIFY(A) #A + NS_CC_BEGIN // -const GLchar * ccPosition_uColor_frag = -#include "ccShader_Position_uColor_frag.h" -const GLchar * ccPosition_uColor_vert = -#include "ccShader_Position_uColor_vert.h" +#include "ccShader_Position_uColor.frag" +#include "ccShader_Position_uColor.vert" // -const GLchar * ccPositionColor_frag = -#include "ccShader_PositionColor_frag.h" -const GLchar * ccPositionColor_vert = -#include "ccShader_PositionColor_vert.h" +#include "ccShader_PositionColor.frag" +#include "ccShader_PositionColor.vert" // -const GLchar * ccPositionTexture_frag = -#include "ccShader_PositionTexture_frag.h" -const GLchar * ccPositionTexture_vert = -#include "ccShader_PositionTexture_vert.h" +#include "ccShader_PositionTexture.frag" +#include "ccShader_PositionTexture.vert" // -const GLchar * ccPositionTextureA8Color_frag = -#include "ccShader_PositionTextureA8Color_frag.h" -const GLchar * ccPositionTextureA8Color_vert = -#include "ccShader_PositionTextureA8Color_vert.h" +#include "ccShader_PositionTextureA8Color.frag" +#include "ccShader_PositionTextureA8Color.vert" // -const GLchar * ccPositionTextureColor_frag = -#include "ccShader_PositionTextureColor_frag.h" -const GLchar * ccPositionTextureColor_vert = -#include "ccShader_PositionTextureColor_vert.h" +#include "ccShader_PositionTextureColor.frag" +#include "ccShader_PositionTextureColor.vert" // -const GLchar * ccPositionTextureColor_noMVP_frag = -#include "ccShader_PositionTextureColor_noMVP_frag.h" -const GLchar * ccPositionTextureColor_noMVP_vert = -#include "ccShader_PositionTextureColor_noMVP_vert.h" +#include "ccShader_PositionTextureColor_noMVP.frag" +#include "ccShader_PositionTextureColor_noMVP.vert" // -const GLchar * ccPositionTextureColorAlphaTest_frag = -#include "ccShader_PositionTextureColorAlphaTest_frag.h" +#include "ccShader_PositionTextureColorAlphaTest.frag" // -const GLchar * ccPositionTexture_uColor_frag = -#include "ccShader_PositionTexture_uColor_frag.h" -const GLchar * ccPositionTexture_uColor_vert = -#include "ccShader_PositionTexture_uColor_vert.h" +#include "ccShader_PositionTexture_uColor.frag" +#include "ccShader_PositionTexture_uColor.vert" -const GLchar * ccPositionColorLengthTexture_frag = -#include "ccShader_PositionColorLengthTexture_frag.h" -const GLchar * ccPositionColorLengthTexture_vert = -#include "ccShader_PositionColorLengthTexture_vert.h" +#include "ccShader_PositionColorLengthTexture.frag" +#include "ccShader_PositionColorLengthTexture.vert" -const GLchar * ccLabelDistanceFieldNormal_frag = -#include "ccShader_Label_frag_df.h" - -const GLchar * ccLabelDistanceFieldGlow_frag = -#include "ccShader_Label_frag_df_glow.h" - -const GLchar * ccLabelNormal_frag = -#include "ccShader_Label_frag_normal.h" - -const GLchar * ccLabelOutline_frag = -#include "ccShader_Label_frag_outline.h" - -const GLchar * ccLabel_vert = -#include "ccShader_Label_vert.h" +// +#include "ccShader_Label.vert" +#include "ccShader_Label_df.frag" +#include "ccShader_Label_df_glow.frag" +#include "ccShader_Label_normal.frag" +#include "ccShader_Label_outline.frag" NS_CC_END diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 7a2219b17e..ed840d9629 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -870,28 +870,28 @@ "cocos/renderer/CMakeLists.txt", "cocos/renderer/ccGLStateCache.cpp", "cocos/renderer/ccGLStateCache.h", - "cocos/renderer/ccShader_Label_frag_df.h", - "cocos/renderer/ccShader_Label_frag_df_glow.h", - "cocos/renderer/ccShader_Label_frag_normal.h", - "cocos/renderer/ccShader_Label_frag_outline.h", - "cocos/renderer/ccShader_Label_vert.h", - "cocos/renderer/ccShader_PositionColorLengthTexture_frag.h", - "cocos/renderer/ccShader_PositionColorLengthTexture_vert.h", - "cocos/renderer/ccShader_PositionColor_frag.h", - "cocos/renderer/ccShader_PositionColor_vert.h", - "cocos/renderer/ccShader_PositionTextureA8Color_frag.h", - "cocos/renderer/ccShader_PositionTextureA8Color_vert.h", - "cocos/renderer/ccShader_PositionTextureColorAlphaTest_frag.h", - "cocos/renderer/ccShader_PositionTextureColor_frag.h", - "cocos/renderer/ccShader_PositionTextureColor_noMVP_frag.h", - "cocos/renderer/ccShader_PositionTextureColor_noMVP_vert.h", - "cocos/renderer/ccShader_PositionTextureColor_vert.h", - "cocos/renderer/ccShader_PositionTexture_frag.h", - "cocos/renderer/ccShader_PositionTexture_uColor_frag.h", - "cocos/renderer/ccShader_PositionTexture_uColor_vert.h", - "cocos/renderer/ccShader_PositionTexture_vert.h", - "cocos/renderer/ccShader_Position_uColor_frag.h", - "cocos/renderer/ccShader_Position_uColor_vert.h", + "cocos/renderer/ccShader_Label.vert", + "cocos/renderer/ccShader_Label_df.frag", + "cocos/renderer/ccShader_Label_df_glow.frag", + "cocos/renderer/ccShader_Label_normal.frag", + "cocos/renderer/ccShader_Label_outline.frag", + "cocos/renderer/ccShader_PositionColor.frag", + "cocos/renderer/ccShader_PositionColor.vert", + "cocos/renderer/ccShader_PositionColorLengthTexture.frag", + "cocos/renderer/ccShader_PositionColorLengthTexture.vert", + "cocos/renderer/ccShader_PositionTexture.frag", + "cocos/renderer/ccShader_PositionTexture.vert", + "cocos/renderer/ccShader_PositionTextureA8Color.frag", + "cocos/renderer/ccShader_PositionTextureA8Color.vert", + "cocos/renderer/ccShader_PositionTextureColor.frag", + "cocos/renderer/ccShader_PositionTextureColor.vert", + "cocos/renderer/ccShader_PositionTextureColorAlphaTest.frag", + "cocos/renderer/ccShader_PositionTextureColor_noMVP.frag", + "cocos/renderer/ccShader_PositionTextureColor_noMVP.vert", + "cocos/renderer/ccShader_PositionTexture_uColor.frag", + "cocos/renderer/ccShader_PositionTexture_uColor.vert", + "cocos/renderer/ccShader_Position_uColor.frag", + "cocos/renderer/ccShader_Position_uColor.vert", "cocos/renderer/ccShaders.cpp", "cocos/renderer/ccShaders.h", "cocos/storage/CMakeLists.txt",