diff --git a/.gitignore b/.gitignore index 3c5b9f3331..0fe28724f7 100644 --- a/.gitignore +++ b/.gitignore @@ -133,5 +133,7 @@ project.properties /external/win32-specific/ /external/winrt-specific/ /external/wp8-specific/ -/v*-deps-*.zip /external/version.json +/templates/lua-template-runtime/runtime +/v*-deps-*.zip +/v*-lua-runtime-*.zip \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d80b96a718..99f439d3e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ env: matrix: - GEN_BINDING=YES - GEN_COCOS_FILES=YES + - PLATFORM=mac-ios PUSH_TO_MAC=YES - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++ - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++ # Since switching to C++11 only the ARM version of the nactive client @@ -24,6 +25,7 @@ env: Wsngwo3jlZtvuPfr3RNhqrz/liNIhKYnlw4KYJO90gMQ9ZQKRTlMv2BMiPw/ 9lV+vgJQDRcFe7dKwtC86vk10EU7Ym2bhVmhMxi/AlmJXgavjmPVdizRT7rh X2Ry/Nb6hGRkH3WS0T3D/KG1+e7lP/TMB9bvo6/locLJ2A6Z1YI= + - secure: PGMnEvysYv9Mnjrof05v9MU41ZlVO7A7SQb4oLuYqhBf0stvZUVEF4fmkOcXRPAd4Cg41aAbtE8RyGaqIFaKHtjHFtTdisM9XVXqL+eMfv5L+8nFCk4S5Fi/ohglO+FBJ9X/NLfAfRZmlwJR+UedU5AJwqlQbKraNkyv/FmDMUc= script: - export CC=$CC_COMPILER - export CXX=$CXX_COMPILER diff --git a/AUTHORS b/AUTHORS index a7332fc8f9..6bbf9002c4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -843,6 +843,12 @@ Developers: twhittock Fixed a bug that Application::run returns wrong value on Mac platform + + asmodehn + Added SDK / NDK detection based on PATH in Setup.py + + myourys + Make cpp template support Eclipse c++ project Retired Core Developers: WenSheng Yang diff --git a/CHANGELOG b/CHANGELOG index 1b2a57f71d..d5c21121bd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,16 +1,22 @@ -cocos2d-x-3.1-alpha1 May.8 2014 +cocos2d-x-3.1-alpha1 May.9 2014 + [NEW] GLProgram: Easy to customize uniforms and attributes by using the new class GLProgramState + [NEW] Template: cpp project support Eclipse c++ project [NEW] UI: add navigation support [NEW] UI: add a widget to play video [NEW] VS: support VS 2013 [FIX] Audio: pause sound automatically when go to background on Android + [FIX] Director: remove keepData and releaseData [FIX] Label: label is unsharp if it's created by system font with small size on iOS & Mac OS X [FIX] Label: Label created with system font is still visible when its opacity is 0 [FIX] Label: Label created with system font havs black border on WP8/WINRT [FIX] Lua: A potential crash in the bindings of sp.SkeletonAnimation.setAnimation [FIX] Lua: Lua template should fail to launch on lua error [FIX] ParticleSystem: Particles can be created without a texture - + [FIX] ParticleSystem: yFlippedCoord behavior fixed. + Added cocos2d/tools/particle to fix particles that were based on the old (broken) behaviour + [FIX] Setup.py: Added SDK / NDK detection based on PATH + [FIX] Value: all types share the same union to reduce memory usage cocos2d-x-3.1-alpha0 May.1 2014 [NEW] Android: Adds support for get response when Activity's onActivityResult is triggered diff --git a/README.md b/README.md index 38f3cd75dd..e4b3a38b4b 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ cocos2d-x ========= [![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.png?branch=v3)](https://travis-ci.org/cocos2d/cocos2d-x) +[![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.png?branch=v3)](https://travis-ci.org/cocos-travis-mac/cocos2d-x) [cocos2d-x][1] is a multi-platform framework for building 2d games, interactive books, demos and other graphical applications. It is based on [cocos2d-iphone][2], but instead of using Objective-C, it uses C++. diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 9c1daa1267..b7b9739561 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -98,6 +98,10 @@ 1A12775A18DFCC4F0005F345 /* CCTweenFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2986667918B1B079000E39CA /* CCTweenFunction.h */; }; 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2986667918B1B079000E39CA /* CCTweenFunction.h */; }; 1A12775C18DFCC590005F345 /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; }; + 1A1645B0191B726C008C7C7F /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A1645AE191B726C008C7C7F /* ConvertUTF.c */; }; + 1A1645B1191B726C008C7C7F /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A1645AE191B726C008C7C7F /* ConvertUTF.c */; }; + 1A1645B2191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */; }; + 1A1645B3191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */; }; 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570047180BC5A10088DEC7 /* CCAction.cpp */; }; 1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570047180BC5A10088DEC7 /* CCAction.cpp */; }; 1A570063180BC5A10088DEC7 /* CCAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570048180BC5A10088DEC7 /* CCAction.h */; }; @@ -278,44 +282,6 @@ 1A570235180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */; }; 1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; }; 1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; }; - 1A57024D180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */; }; - 1A57024E180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */; }; - 1A57024F180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */; }; - 1A570250180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */; }; - 1A570251180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */; }; - 1A570252180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */; }; - 1A570253180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */; }; - 1A570254180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */; }; - 1A570255180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */; }; - 1A570256180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */; }; - 1A570257180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */; }; - 1A570258180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */; }; - 1A570259180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */; }; - 1A57025A180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */; }; - 1A57025B180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */; }; - 1A57025C180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */; }; - 1A57025D180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */; }; - 1A57025E180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */; }; - 1A57025F180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */; }; - 1A570260180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */; }; - 1A570261180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */; }; - 1A570262180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */; }; - 1A570263180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */; }; - 1A570264180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */; }; - 1A570265180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */; }; - 1A570266180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */; }; - 1A570267180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */; }; - 1A570268180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */; }; - 1A570269180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; - 1A57026A180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */; }; - 1A57026B180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */; }; - 1A57026C180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */; }; - 1A57026D180BCC6F0088DEC7 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */; }; - 1A57026E180BCC6F0088DEC7 /* CCShaderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */; }; - 1A570271180BCC6F0088DEC7 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */; }; - 1A570272180BCC6F0088DEC7 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */; }; - 1A570273180BCC6F0088DEC7 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57024C180BCC6F0088DEC7 /* ccShaders.h */; }; - 1A570274180BCC6F0088DEC7 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57024C180BCC6F0088DEC7 /* ccShaders.h */; }; 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; }; 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; }; 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570277180BCC900088DEC7 /* CCSprite.h */; }; @@ -449,14 +415,6 @@ 1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A5703BA180BD2800088DEC7 /* libwebp.a */; }; 1A57052B180BD31F0088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052A180BD31F0088DEC7 /* libfreetype.a */; }; 1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052D180BD3280088DEC7 /* libfreetype.a */; }; - 1A570533180BD9500088DEC7 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */; }; - 1A570534180BD9500088DEC7 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */; }; - 1A570535180BD9500088DEC7 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570530180BD9500088DEC7 /* CCGLProgram.h */; }; - 1A570536180BD9500088DEC7 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570530180BD9500088DEC7 /* CCGLProgram.h */; }; - 1A570537180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */; }; - 1A570538180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */; }; - 1A570539180BD9500088DEC7 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570532180BD9500088DEC7 /* ccGLStateCache.h */; }; - 1A57053A180BD9500088DEC7 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570532180BD9500088DEC7 /* ccGLStateCache.h */; }; 1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; @@ -596,16 +554,6 @@ 1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */; }; 1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; }; 1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; }; - 1AA95FDE18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */; }; - 1AA95FDF18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */; }; - 1AA95FE018EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */; }; - 1AA95FE118EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */; }; - 1AA95FE218EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */; }; - 1AA95FE318EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */; }; - 1AA95FE418EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */; }; - 1AA95FE518EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */; }; - 1AA95FE618EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */; }; - 1AA95FE718EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */; }; 1AAF528B180E2ECC000584C8 /* b2BroadPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B61807AF9C005B8026 /* b2BroadPhase.cpp */; }; 1AAF528C180E2ECC000584C8 /* b2BroadPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168B71807AF9C005B8026 /* b2BroadPhase.h */; }; 1AAF528D180E2ECC000584C8 /* b2CollideCircle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B81807AF9C005B8026 /* b2CollideCircle.cpp */; }; @@ -821,6 +769,8 @@ 1ABA68AF1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */; }; 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */; }; 1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */; }; + 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC026991914068200FA920D /* ConvertUTF.h */; }; + 1AC0269D1914068200FA920D /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC026991914068200FA920D /* ConvertUTF.h */; }; 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; @@ -1039,10 +989,6 @@ 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; 2905FA5818CF08D100240AA3 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; 2905FA5918CF08D100240AA3 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; - 2905FA5A18CF08D100240AA3 /* UILayoutDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FA18CF08D000240AA3 /* UILayoutDefine.cpp */; }; - 2905FA5B18CF08D100240AA3 /* UILayoutDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FA18CF08D000240AA3 /* UILayoutDefine.cpp */; }; - 2905FA5C18CF08D100240AA3 /* UILayoutDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FB18CF08D000240AA3 /* UILayoutDefine.h */; }; - 2905FA5D18CF08D100240AA3 /* UILayoutDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FB18CF08D000240AA3 /* UILayoutDefine.h */; }; 2905FA5E18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; 2905FA5F18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; @@ -1614,6 +1560,66 @@ 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; }; 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; }; 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; }; + 5034CA19191D591000CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F7191D591000CE6051 /* ccShaders.h */; }; + 5034CA1A191D591100CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F7191D591000CE6051 /* ccShaders.h */; }; + 5034CA1B191D591100CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9F8191D591000CE6051 /* ccShaders.cpp */; }; + 5034CA1C191D591100CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9F8191D591000CE6051 /* ccShaders.cpp */; }; + 5034CA1D191D591100CE6051 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */; }; + 5034CA1E191D591100CE6051 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */; }; + 5034CA1F191D591100CE6051 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */; }; + 5034CA20191D591100CE6051 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */; }; + 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 */; }; + 5034CA50191D591100CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */; }; + 5034CA51191D591100CE6051 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */; }; + 5034CA52191D591100CE6051 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */; }; + 5034CA53191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */; }; + 5034CA54191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */; }; + 5034CA55191D591100CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA15191D591000CE6051 /* CCGLProgramState.h */; }; + 5034CA56191D591100CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA15191D591000CE6051 /* CCGLProgramState.h */; }; + 5034CA57191D591100CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */; }; + 5034CA58191D591100CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */; }; + 5034CA59191D591100CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA17191D591000CE6051 /* CCGLProgram.h */; }; + 5034CA5A191D591100CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA17191D591000CE6051 /* CCGLProgram.h */; }; + 5034CA5B191D591100CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA18191D591000CE6051 /* CCGLProgram.cpp */; }; + 5034CA5C191D591100CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA18191D591000CE6051 /* CCGLProgram.cpp */; }; 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */; }; 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; @@ -1688,10 +1694,6 @@ 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; 50FCEBCC18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; - A023FA34185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; - A023FA35185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */; }; - A023FA36185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; - A023FA37185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */ = {isa = PBXBuildFile; fileRef = A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */; }; A04583F2189053B500E32FE8 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A04583F0189053B500E32FE8 /* CCGLView.cpp */; }; A04583F3189053B500E32FE8 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A04583F1189053B500E32FE8 /* CCGLView.h */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; @@ -1874,6 +1876,8 @@ 1A0DB7301823827C0025743D /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; 1A0DB7311823827C0025743D /* CCEAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEAGLView.h; sourceTree = ""; }; 1A0DB7351823828F0025743D /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; + 1A1645AE191B726C008C7C7F /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ConvertUTF.c; sourceTree = ""; }; + 1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvertUTFWrapper.cpp; sourceTree = ""; }; 1A570047180BC5A10088DEC7 /* CCAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAction.cpp; sourceTree = ""; }; 1A570048180BC5A10088DEC7 /* CCAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAction.h; sourceTree = ""; }; 1A570049180BC5A10088DEC7 /* CCActionCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionCamera.cpp; sourceTree = ""; }; @@ -1964,25 +1968,6 @@ 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystemQuad.h; sourceTree = ""; }; 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCScriptSupport.cpp; sourceTree = ""; }; 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCScriptSupport.h; sourceTree = ""; }; - 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_frag.h; sourceTree = ""; }; - 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_vert.h; sourceTree = ""; }; - 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_frag.h; sourceTree = ""; }; - 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_vert.h; sourceTree = ""; }; - 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_frag.h; sourceTree = ""; }; - 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_vert.h; sourceTree = ""; }; - 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_frag.h; sourceTree = ""; }; - 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_frag.h; sourceTree = ""; }; - 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_vert.h; sourceTree = ""; }; - 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_vert.h; sourceTree = ""; }; - 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_frag.h; sourceTree = ""; }; - 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_vert.h; sourceTree = ""; }; - 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_frag.h; sourceTree = ""; }; - 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_vert.h; sourceTree = ""; }; - 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColorAlphaTest_frag.h; sourceTree = ""; }; - 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCShaderCache.cpp; sourceTree = ""; }; - 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = ""; }; - 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; - 1A57024C180BCC6F0088DEC7 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; 1A570276180BCC900088DEC7 /* CCSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCSprite.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A570277180BCC900088DEC7 /* CCSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite.h; sourceTree = ""; }; 1A570278180BCC900088DEC7 /* CCSpriteBatchNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSpriteBatchNode.cpp; sourceTree = ""; }; @@ -2055,10 +2040,6 @@ 1A5703BA180BD2800088DEC7 /* libwebp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebp.a; sourceTree = ""; }; 1A57052A180BD31F0088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = ""; }; 1A57052D180BD3280088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = ""; }; - 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; - 1A570530180BD9500088DEC7 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; - 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; - 1A570532180BD9500088DEC7 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; 1A57FFF7180BC5160088DEC7 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; name = CHANGELOG; path = ../CHANGELOG; sourceTree = ""; }; 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionFrame.cpp; sourceTree = ""; }; 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionFrame.h; sourceTree = ""; }; @@ -2129,11 +2110,6 @@ 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLBufferedNode.h; sourceTree = ""; }; 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtocols.h; sourceTree = ""; }; 1A9DCA0C180E6955007A3AD4 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firePngData.h; sourceTree = ""; }; - 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df_glow.h; sourceTree = ""; }; - 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df.h; sourceTree = ""; }; - 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_normal.h; sourceTree = ""; }; - 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_outline.h; sourceTree = ""; }; - 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_vert.h; sourceTree = ""; }; 1AAF5351180E3060000584C8 /* AssetsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssetsManager.cpp; sourceTree = ""; }; 1AAF5352180E3060000584C8 /* AssetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetsManager.h; sourceTree = ""; }; 1AAF5362180E3374000584C8 /* HttpClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClient.cpp; sourceTree = ""; }; @@ -2153,6 +2129,7 @@ 1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageAndroid.cpp; sourceTree = ""; }; 1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFontCharMap.cpp; sourceTree = ""; }; 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFontCharMap.h; sourceTree = ""; }; + 1AC026991914068200FA920D /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvertUTF.h; sourceTree = ""; }; 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBAnimationManager.cpp; sourceTree = ""; }; 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBAnimationManager.h; sourceTree = ""; }; 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBFileLoader.cpp; sourceTree = ""; }; @@ -2262,8 +2239,6 @@ 2905F9F718CF08D000240AA3 /* UIImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIImageView.h; sourceTree = ""; }; 2905F9F818CF08D000240AA3 /* UILayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayout.cpp; sourceTree = ""; }; 2905F9F918CF08D000240AA3 /* UILayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayout.h; sourceTree = ""; }; - 2905F9FA18CF08D000240AA3 /* UILayoutDefine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutDefine.cpp; sourceTree = ""; }; - 2905F9FB18CF08D000240AA3 /* UILayoutDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutDefine.h; sourceTree = ""; }; 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutParameter.cpp; sourceTree = ""; }; 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutParameter.h; sourceTree = ""; }; 2905F9FE18CF08D000240AA3 /* UIListView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIListView.cpp; sourceTree = ""; }; @@ -2289,6 +2264,7 @@ 2905FA1218CF08D100240AA3 /* UITextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextField.h; sourceTree = ""; }; 2905FA1318CF08D100240AA3 /* UIWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidget.cpp; sourceTree = ""; }; 2905FA1418CF08D100240AA3 /* UIWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidget.h; sourceTree = ""; }; + 29080DEB191B82CE0066F8DF /* UIDeprecated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIDeprecated.h; sourceTree = ""; }; 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventFocus.cpp; path = ../base/CCEventFocus.cpp; sourceTree = ""; }; 296CAD211915EC8000C64FBF /* CCEventFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventFocus.h; path = ../base/CCEventFocus.h; sourceTree = ""; }; 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerFocus.cpp; path = ../base/CCEventListenerFocus.cpp; sourceTree = ""; }; @@ -2694,6 +2670,40 @@ 500DC9BB19106E89007B91BF /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = ""; }; 50272538190BF1B900AAF4ED /* cocos2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = ../cocos/cocos2d.h; sourceTree = ""; }; 50272539190BF1B900AAF4ED /* cocos2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2d.cpp; path = ../cocos/cocos2d.cpp; sourceTree = ""; }; + 5034C9F7191D591000CE6051 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; + 5034C9F8191D591000CE6051 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; + 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramCache.h; sourceTree = ""; }; + 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramCache.cpp; 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 = ""; }; + 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = ""; }; + 5034CA15191D591000CE6051 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = ""; }; + 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 = ""; }; @@ -2764,8 +2774,6 @@ A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; A0053FBF189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = ""; }; A0053FC0189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_frag.h; sourceTree = ""; }; - A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_vert.h; sourceTree = ""; }; A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3243,43 +3251,6 @@ name = "script-support"; sourceTree = ""; }; - 1A570238180BCC580088DEC7 /* shaders */ = { - isa = PBXGroup; - children = ( - 1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */, - 1A570530180BD9500088DEC7 /* CCGLProgram.h */, - 1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */, - 1A570532180BD9500088DEC7 /* ccGLStateCache.h */, - 1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */, - 1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */, - 1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */, - 1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */, - 1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */, - 1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */, - 1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */, - 1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */, - 1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */, - 1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */, - 1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */, - 1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */, - 1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */, - 1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */, - 1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */, - 1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */, - 1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */, - 1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */, - A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */, - A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */, - 1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */, - 1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */, - 1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */, - 1A570249180BCC6F0088DEC7 /* CCShaderCache.h */, - 1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */, - 1A57024C180BCC6F0088DEC7 /* ccShaders.h */, - ); - name = shaders; - sourceTree = ""; - }; 1A570275180BCC840088DEC7 /* sprite-nodes */ = { isa = PBXGroup; children = ( @@ -3405,6 +3376,7 @@ 1A57033E180BD0490088DEC7 /* external */ = { isa = PBXGroup; children = ( + 1AC026971914068200FA920D /* ConvertUTF */, 46C02E0418E91123004B7456 /* xxhash */, 46A168B21807AF9C005B8026 /* Box2D */, 46A1693A1807AFD6005B8026 /* chipmunk */, @@ -3822,6 +3794,17 @@ path = "local-storage"; sourceTree = ""; }; + 1AC026971914068200FA920D /* ConvertUTF */ = { + isa = PBXGroup; + children = ( + 1A1645AE191B726C008C7C7F /* ConvertUTF.c */, + 1AC026991914068200FA920D /* ConvertUTF.h */, + 1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */, + ); + name = ConvertUTF; + path = ../external/ConvertUTF; + sourceTree = ""; + }; 1AD71CF7180E26E600808F54 /* editor-support */ = { isa = PBXGroup; children = ( @@ -3992,8 +3975,6 @@ 2905F9F718CF08D000240AA3 /* UIImageView.h */, 2905F9F818CF08D000240AA3 /* UILayout.cpp */, 2905F9F918CF08D000240AA3 /* UILayout.h */, - 2905F9FA18CF08D000240AA3 /* UILayoutDefine.cpp */, - 2905F9FB18CF08D000240AA3 /* UILayoutDefine.h */, 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */, 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */, 2905F9FE18CF08D000240AA3 /* UIListView.cpp */, @@ -4027,6 +4008,7 @@ 50E6D33118E174130051CA34 /* UIRelativeBox.h */, 50E6D33218E174130051CA34 /* UIVBox.cpp */, 50E6D33318E174130051CA34 /* UIVBox.h */, + 29080DEB191B82CE0066F8DF /* UIDeprecated.h */, ); name = ui; path = ../cocos/ui; @@ -4467,7 +4449,6 @@ 1A570218180BCC000088DEC7 /* particle-nodes */, 46A16A5A1807B038005B8026 /* platform */, 1A570231180BCC380088DEC7 /* script-support */, - 1A570238180BCC580088DEC7 /* shaders */, 1A570275180BCC840088DEC7 /* sprite-nodes */, 1A57029A180BCD4F0088DEC7 /* support */, 1A5702BC180BCE0A0088DEC7 /* text-input-node */, @@ -4641,6 +4622,19 @@ 500DC89819105D41007B91BF /* renderer */ = { isa = PBXGroup; children = ( + 5034CA5D191D591900CE6051 /* shaders */, + 5034C9F7191D591000CE6051 /* ccShaders.h */, + 5034C9F8191D591000CE6051 /* ccShaders.cpp */, + 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */, + 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */, + 5034CA11191D591000CE6051 /* ccGLStateCache.h */, + 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */, + 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */, + 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */, + 5034CA15191D591000CE6051 /* CCGLProgramState.h */, + 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */, + 5034CA17191D591000CE6051 /* CCGLProgram.h */, + 5034CA18191D591000CE6051 /* CCGLProgram.cpp */, 500DC89919105D41007B91BF /* CCBatchCommand.cpp */, 500DC89A19105D41007B91BF /* CCBatchCommand.h */, 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */, @@ -4659,6 +4653,35 @@ path = ../cocos/renderer; sourceTree = ""; }; + 5034CA5D191D591900CE6051 /* shaders */ = { + isa = PBXGroup; + children = ( + 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 = ""; + }; 50FCEB6818C72017004AD434 /* WidgetReader */ = { isa = PBXGroup; children = ( @@ -4896,6 +4919,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */, 2AC795E018628723005EC8E1 /* Event.h in Headers */, 2AC795E118628723005EC8E1 /* EventData.h in Headers */, @@ -4906,6 +4930,7 @@ 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */, 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.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 */, @@ -4930,6 +4955,7 @@ 500DC99A19106300007B91BF /* ccTypes.h in Headers */, 46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */, 500DC8C219105D41007B91BF /* CCRenderCommandPool.h in Headers */, + 5034CA4D191D591100CE6051 /* ccGLStateCache.h in Headers */, 46A1705C1807CC1C005B8026 /* CCStdC.h in Headers */, 46A1704F1807CC1C005B8026 /* CCApplication.h in Headers */, 500DC98C19106300007B91BF /* CCPlatformMacros.h in Headers */, @@ -4942,8 +4968,8 @@ 1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */, 50FCEBB518C72017004AD434 /* SliderReader.h in Headers */, + 5034CA3B191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */, - A023FA34185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, 500DC8BC19105D41007B91BF /* CCQuadCommand.h in Headers */, @@ -4951,7 +4977,6 @@ 1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */, 296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, - A023FA36185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, 1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */, 1A570087180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */, @@ -4980,6 +5005,7 @@ 500DC98219106300007B91BF /* ccMacros.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, + 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */, 500DC8C619105D41007B91BF /* CCRenderer.h in Headers */, 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */, @@ -4987,11 +5013,13 @@ 50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */, 50E6D33E18E174130051CA34 /* UIVBox.h in Headers */, 500DC9AC19106300007B91BF /* ZipUtils.h in Headers */, + 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */, 1A57019F180BCB590088DEC7 /* CCFont.h in Headers */, 1A5701A3180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */, 1A5701A7180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, 1A5701B3180BCB590088DEC7 /* CCFontFNT.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 */, @@ -4999,7 +5027,7 @@ 1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 500DC93A19106300007B91BF /* CCConfiguration.h in Headers */, 1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, - 1AA95FE618EBB8EF00AE7485 /* ccShader_Label_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 */, @@ -5020,43 +5048,31 @@ 500DC99E19106300007B91BF /* CCValue.h in Headers */, 1A01C69618F57BE800EFE3A6 /* CCInteger.h in Headers */, 1A570223180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, + 5034CA43191D591100CE6051 /* ccShader_Label.vert in Headers */, 1A570227180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022B180BCC1A0088DEC7 /* CCParticleSystem.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 */, 1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, - 1A57024D180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */, - 1A57024F180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */, - 1AA95FE418EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */, 500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */, 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */, - 1A570251180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */, 500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */, - 1A570253180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */, - 1A570255180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, - 1A570257180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, - 1A570259180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */, - 1A57025B180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */, + 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 500DC9A019106300007B91BF /* CCVector.h in Headers */, - 1A57025D180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */, - 1A57025F180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */, 500DC92C19106300007B91BF /* atitc.h in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, - 1A570261180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */, 500DC98419106300007B91BF /* CCMap.h in Headers */, - 1A570263180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */, - 1AA95FDE18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */, 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */, - 1A570265180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */, 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */, - 1A570267180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */, - 1A570269180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, - 1A57026D180BCC6F0088DEC7 /* CCShaderCache.h in Headers */, - 1A570273180BCC6F0088DEC7 /* ccShaders.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 in Headers */, 1A570288180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, 1A57028C180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */, 5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */, @@ -5081,6 +5097,7 @@ 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */, 1A5702F4180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 1A5702F8180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, + 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, 1A5702FC180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */, 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */, 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, @@ -5102,10 +5119,7 @@ 500DC99619106300007B91BF /* CCScheduler.h in Headers */, 1A57035A180BD0B00088DEC7 /* unzip.h in Headers */, 296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */, - 1A570535180BD9500088DEC7 /* CCGLProgram.h in Headers */, - 1AA95FE018EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */, 500DC98819106300007B91BF /* CCNS.h in Headers */, - 1A570539180BD9500088DEC7 /* ccGLStateCache.h in Headers */, 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */, 1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */, B37510741823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, @@ -5115,9 +5129,11 @@ 1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */, 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */, 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.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 in Headers */, 1AD71DCB180E26E600808F54 /* CCControlButtonLoader.h in Headers */, 1AD71DCF180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, @@ -5130,7 +5146,6 @@ 1AD71DEB180E26E600808F54 /* CCMenuItemLoader.h in Headers */, 1AD71DED180E26E600808F54 /* CCMenuLoader.h in Headers */, 1AD71DF1180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, - 2905FA5C18CF08D100240AA3 /* UILayoutDefine.h in Headers */, 2905FA7218CF08D100240AA3 /* UIScrollInterface.h in Headers */, B2AF2F9B18EBAEAE00C5807C /* Matrix.h in Headers */, 1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */, @@ -5139,6 +5154,7 @@ 1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, 1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, + 5034CA51191D591100CE6051 /* CCGLProgramStateCache.h in Headers */, 1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */, 1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */, 1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */, @@ -5169,6 +5185,7 @@ 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */, 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */, 1AD71ECF180E26E600808F54 /* Skeleton.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 */, @@ -5193,10 +5210,10 @@ 1A9DCA2D180E6955007A3AD4 /* CCProtocols.h in Headers */, 50FCEBB118C72017004AD434 /* ScrollViewReader.h in Headers */, 500DC98A19106300007B91BF /* CCPlatformConfig.h in Headers */, + 5034CA19191D591000CE6051 /* ccShaders.h in Headers */, 1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */, B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, 50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */, - 1AA95FE218EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */, 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, @@ -5211,6 +5228,7 @@ 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */, 1A8C59B5180E930E00EF57C3 /* CCBone.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 */, @@ -5218,6 +5236,7 @@ B2AF2FB118EBBDA100C5807C /* CCMath.h in Headers */, 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */, 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */, + 5034CA59191D591100CE6051 /* CCGLProgram.h in Headers */, 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, 1A8C59D1180E930E00EF57C3 /* CCDatas.h in Headers */, 1A8C59D5180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, @@ -5226,7 +5245,9 @@ 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */, 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */, + 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */, + 5034CA1D191D591100CE6051 /* CCGLProgramCache.h in Headers */, 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */, 1A8C59F9180E930E00EF57C3 /* CCTransformHelp.h in Headers */, @@ -5389,6 +5410,7 @@ 2AC795E91862875D005EC8E1 /* EventData.h in Headers */, 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */, 500DC93519106300007B91BF /* CCAutoreleasePool.h in Headers */, + 5034CA1A191D591100CE6051 /* ccShaders.h in Headers */, 46A1702D1807CBFE005B8026 /* CCCommon.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, @@ -5400,6 +5422,7 @@ 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */, 46A1703F1807CC07005B8026 /* CCDirectorCaller.h in Headers */, 46A170381807CBFE005B8026 /* CCSAXParser.h in Headers */, + 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 500DC97319106300007B91BF /* CCEventListenerMouse.h in Headers */, 500DC99319106300007B91BF /* CCRefPtr.h in Headers */, 46A1702E1807CBFE005B8026 /* CCDevice.h in Headers */, @@ -5407,9 +5430,8 @@ 46A170451807CC07005B8026 /* CCESRenderer.h in Headers */, 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */, 46A170411807CC07005B8026 /* CCGLView.h in Headers */, - A023FA37185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h in Headers */, - 1AA95FE118EBB8EF00AE7485 /* ccShader_Label_frag_df.h in Headers */, 46A170301807CBFE005B8026 /* CCGLViewProtocol.h in Headers */, + 5034CA4E191D591100CE6051 /* ccGLStateCache.h in Headers */, 500DC8B119105D41007B91BF /* CCCustomCommand.h in Headers */, 500DC8DA19105F7D007B91BF /* CCMathBase.h in Headers */, 46A170321807CBFE005B8026 /* CCFileUtils.h in Headers */, @@ -5423,6 +5445,7 @@ 46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */, 46A170431807CC07005B8026 /* CCES2Renderer.h in Headers */, 46A170331807CBFE005B8026 /* CCImage.h in Headers */, + 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */, 46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */, 46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */, @@ -5433,9 +5456,11 @@ 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.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_outline.frag in Headers */, 1A570078180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A01C68918F57BE800EFE3A6 /* CCBool.h in Headers */, 1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */, @@ -5457,6 +5482,7 @@ 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */, 2905FA7318CF08D100240AA3 /* UIScrollInterface.h in Headers */, 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */, + 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */, 500DC93119106300007B91BF /* base64.h in Headers */, B2AF2FA018EBAEAE00C5807C /* Quaternion.h in Headers */, 50E6D33718E174130051CA34 /* UIHBox.h in Headers */, @@ -5464,13 +5490,14 @@ 50E6D33F18E174130051CA34 /* UIVBox.h in Headers */, 1A570115180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, 06CAAAC5186AD7E50012A414 /* TriggerObj.h in Headers */, - 2905FA5D18CF08D100240AA3 /* UILayoutDefine.h in Headers */, 1A57011E180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570122180BC90D0088DEC7 /* CCGrid.h in Headers */, 500DC8C319105D41007B91BF /* CCRenderCommandPool.h in Headers */, + 5034CA52191D591100CE6051 /* CCGLProgramStateCache.h in Headers */, 500DC8C719105D41007B91BF /* CCRenderer.h in Headers */, 500DC98519106300007B91BF /* CCMap.h in Headers */, 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */, + 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, @@ -5479,13 +5506,14 @@ 1A5701B8180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, 1A5701BC180BCB5A0088DEC7 /* CCLabel.h in Headers */, 1A5701C0180BCB5A0088DEC7 /* CCLabelAtlas.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 */, - 1AA95FE318EBB8EF00AE7485 /* ccShader_Label_frag_normal.h in Headers */, + 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, 1A5701CE180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, 296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */, 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */, @@ -5500,43 +5528,28 @@ 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */, 1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, 1A570205180BCBD40088DEC7 /* CCClippingNode.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 */, 1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, 1A570224180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, 500DC95F19106300007B91BF /* CCEventKeyboard.h in Headers */, - 1AA95FE518EBB8EF00AE7485 /* ccShader_Label_frag_outline.h in Headers */, 500DC95B19106300007B91BF /* CCEventDispatcher.h in Headers */, 373B912A187891FB00198F86 /* CCComBase.h in Headers */, 500DC8D419105F7D007B91BF /* CCAffineTransform.h in Headers */, 1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, + 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */, 1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, - 1A57024E180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h in Headers */, - 1A570250180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h in Headers */, 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */, - 1A570252180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h in Headers */, - 1A570254180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h in Headers */, 500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */, - 1A570256180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h in Headers */, - 1A570258180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h in Headers */, 500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */, 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */, - 1A57025A180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h in Headers */, 500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */, - 1A57025C180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h in Headers */, - 1A57025E180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h in Headers */, - 1A570260180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h in Headers */, - 1A570262180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h in Headers */, + 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 500DC99119106300007B91BF /* CCRef.h in Headers */, - 1A570264180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h in Headers */, - 1A570266180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h in Headers */, - 1A570268180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h in Headers */, - 1A57026A180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h in Headers */, - 1A57026E180BCC6F0088DEC7 /* CCShaderCache.h in Headers */, - 1A570274180BCC6F0088DEC7 /* ccShaders.h in Headers */, 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570285180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, 1A570289180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, @@ -5551,6 +5564,7 @@ 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */, 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */, 1A5702C5180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */, + 5034CA1E191D591100CE6051 /* CCGLProgramCache.h in Headers */, 50FCEB9A18C72017004AD434 /* CheckBoxReader.h in Headers */, 500DC8AD19105D41007B91BF /* CCBatchCommand.h in Headers */, 1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, @@ -5561,8 +5575,10 @@ 1A5702ED180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 500DC99F19106300007B91BF /* CCValue.h in Headers */, 1A5702F1180BCE750088DEC7 /* CCTMXLayer.h in Headers */, + 5034CA44191D591100CE6051 /* ccShader_Label.vert in Headers */, 1A5702F5180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 1A5702F9180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, + 1AC0269D1914068200FA920D /* ConvertUTF.h in Headers */, 500DC9A119106300007B91BF /* CCVector.h in Headers */, 1A5702FD180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */, 1A570303180BCE890088DEC7 /* CCParallaxNode.h in Headers */, @@ -5582,16 +5598,15 @@ 1A570327180BCF660088DEC7 /* TGAlib.h in Headers */, 1A570332180BCFD50088DEC7 /* CCUserDefault.h in Headers */, 500DC94319106300007B91BF /* CCData.h in Headers */, - 1AA95FE718EBB8EF00AE7485 /* ccShader_Label_vert.h in Headers */, 1A57034E180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570357180BD0B00088DEC7 /* ioapi.h in Headers */, 1A01C69B18F57BE800EFE3A6 /* CCSet.h in Headers */, 1A57035B180BD0B00088DEC7 /* unzip.h in Headers */, - 1A570536180BD9500088DEC7 /* CCGLProgram.h in Headers */, - 1A57053A180BD9500088DEC7 /* ccGLStateCache.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 in Headers */, 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */, 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */, @@ -5601,7 +5616,9 @@ 1AD71DCC180E26E600808F54 /* CCControlButtonLoader.h in Headers */, 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, + 5034CA3C191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 46C02E0A18E91123004B7456 /* xxhash.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 */, @@ -5637,6 +5654,7 @@ 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */, 500DC96719106300007B91BF /* CCEventListenerAcceleration.h in Headers */, 1AD71EB0180E26E600808F54 /* AttachmentLoader.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 */, @@ -5666,18 +5684,20 @@ 1AAF5379180E3374000584C8 /* WebSocket.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, 1A9DCA26180E6955007A3AD4 /* ccFPSImages.h in Headers */, + 5034CA5A191D591100CE6051 /* CCGLProgram.h in Headers */, 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, 1A0DB7321823827C0025743D /* CCGL.h in Headers */, 1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */, 500DC96B19106300007B91BF /* CCEventListenerCustom.h in Headers */, 1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */, - 1AA95FDF18EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h in Headers */, 1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */, 296CAD2B1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, 1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */, 500DC99B19106300007B91BF /* ccTypes.h in Headers */, 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, + 5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, + 5034CA56191D591100CE6051 /* CCGLProgramState.h in Headers */, 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, 2905FA4D18CF08D100240AA3 /* UICheckBox.h in Headers */, 500DC9A519106300007B91BF /* etc1.h in Headers */, @@ -5722,7 +5742,6 @@ 1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */, B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, 500DC94B19106300007B91BF /* CCDirector.h in Headers */, - A023FA35185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h in Headers */, 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */, 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */, @@ -6089,6 +6108,7 @@ 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */, 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */, 1A01C68A18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, + 1A1645B0191B726C008C7C7F /* ConvertUTF.c in Sources */, 500DC93219106300007B91BF /* CCAutoreleasePool.cpp in Sources */, 2905FA5618CF08D100240AA3 /* UILayout.cpp in Sources */, 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */, @@ -6119,6 +6139,7 @@ 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */, 46A170251807CBFC005B8026 /* CCThread.cpp in Sources */, 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, + 5034CA4F191D591100CE6051 /* ccGLStateCache.cpp in Sources */, 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 500DC8BE19105D41007B91BF /* CCRenderCommand.cpp in Sources */, @@ -6141,7 +6162,6 @@ 1A57008D180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570091180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, B2AF2F9918EBAEAE00C5807C /* Matrix.cpp in Sources */, - 2905FA5A18CF08D100240AA3 /* UILayoutDefine.cpp in Sources */, 500DC94419106300007B91BF /* CCDataVisitor.cpp in Sources */, 1A570098180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */, @@ -6158,14 +6178,17 @@ 1A57011F180BC90D0088DEC7 /* CCGrid.cpp in Sources */, 50FCEBA718C72017004AD434 /* LoadingBarReader.cpp in Sources */, 06C0F2EF186AD822003594D5 /* ObjectFactory.cpp in Sources */, + 5034CA53191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */, 500DC96419106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */, 1A57019D180BCB590088DEC7 /* CCFont.cpp in Sources */, 1A5701A1180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, 1A5701A5180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */, 500DC96819106300007B91BF /* CCEventListenerCustom.cpp in Sources */, 500DC95019106300007B91BF /* CCEventAcceleration.cpp in Sources */, + 5034CA1B191D591100CE6051 /* ccShaders.cpp in Sources */, 1A5701B1180BCB590088DEC7 /* CCFontFNT.cpp in Sources */, 1A5701B5180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */, + 5034CA1F191D591100CE6051 /* CCGLProgramCache.cpp in Sources */, 1A5701B9180BCB5A0088DEC7 /* CCLabel.cpp in Sources */, 500DC93819106300007B91BF /* CCConfiguration.cpp in Sources */, 500DC9A619106300007B91BF /* s3tc.cpp in Sources */, @@ -6186,6 +6209,7 @@ 500DC9B619106E6D007B91BF /* TransformUtils.cpp in Sources */, 1A5701EE180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */, 1A5701F7180BCBAD0088DEC7 /* CCMenu.cpp in Sources */, + 1A1645B2191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, 1A5701FB180BCBAD0088DEC7 /* CCMenuItem.cpp in Sources */, 1A570202180BCBD40088DEC7 /* CCClippingNode.cpp in Sources */, 06CAAACF186AD7FC0012A414 /* TriggerBase.cpp in Sources */, @@ -6200,8 +6224,6 @@ 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */, 500DC9AA19106300007B91BF /* ZipUtils.cpp in Sources */, 1A570234180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */, - 1A57026B180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */, - 1A570271180BCC6F0088DEC7 /* ccShaders.cpp in Sources */, 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, @@ -6246,8 +6268,6 @@ 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, - 1A570533180BD9500088DEC7 /* CCGLProgram.cpp in Sources */, - 1A570537180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */, 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, 500DC95419106300007B91BF /* CCEventCustom.cpp in Sources */, 1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */, @@ -6277,6 +6297,7 @@ 1AD71DF7180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, 1AD71DFD180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, 50FCEB9318C72017004AD434 /* ButtonReader.cpp in Sources */, + 5034CA57191D591100CE6051 /* CCGLProgramState.cpp in Sources */, 1AD71E01180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, 1AD71E05180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, 1AD71E09180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, @@ -6339,6 +6360,7 @@ 1A8C59AF180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */, 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, + 5034CA5B191D591100CE6051 /* CCGLProgram.cpp in Sources */, 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */, 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */, @@ -6606,6 +6628,7 @@ 1A5701DF180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, 1A5701E3180BCB8C0088DEC7 /* CCScene.cpp in Sources */, 500DC95119106300007B91BF /* CCEventAcceleration.cpp in Sources */, + 5034CA5C191D591100CE6051 /* CCGLProgram.cpp in Sources */, 500DC9B11910633C007B91BF /* CCTouch.cpp in Sources */, 1A5701E7180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, 1A5701EB180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, @@ -6628,8 +6651,6 @@ 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */, 2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */, 50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */, - 1A57026C180BCC6F0088DEC7 /* CCShaderCache.cpp in Sources */, - 1A570272180BCC6F0088DEC7 /* ccShaders.cpp in Sources */, 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */, 500DC93319106300007B91BF /* CCAutoreleasePool.cpp in Sources */, 1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, @@ -6651,7 +6672,6 @@ 1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, 1A5702EF180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */, 1A5702F3180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, - 2905FA5B18CF08D100240AA3 /* UILayoutDefine.cpp in Sources */, 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */, 1A5702F7180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, 1A5702FB180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, @@ -6674,9 +6694,7 @@ 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570355180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570359180BD0B00088DEC7 /* unzip.cpp in Sources */, - 1A570534180BD9500088DEC7 /* CCGLProgram.cpp in Sources */, 500DC96519106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */, - 1A570538180BD9500088DEC7 /* ccGLStateCache.cpp in Sources */, 500DC94D19106300007B91BF /* CCEvent.cpp in Sources */, 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, 1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */, @@ -6701,9 +6719,11 @@ 06CAAAC8186AD7EB0012A414 /* TriggerObj.cpp in Sources */, 1AD71DF0180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */, + 5034CA50191D591100CE6051 /* ccGLStateCache.cpp in Sources */, 1AD71DF4180E26E600808F54 /* CCNodeLoader.cpp in Sources */, 1AD71DF8180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, 1AD71DFE180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, + 5034CA54191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */, 1AD71E02180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, 1AD71E06180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, 1AD71E0A180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, @@ -6748,11 +6768,13 @@ 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */, 500DC93D19106300007B91BF /* CCConsole.cpp in Sources */, 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */, + 5034CA58191D591100CE6051 /* CCGLProgramState.cpp in Sources */, 1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 1A9DCA24180E6955007A3AD4 /* ccFPSImages.c in Sources */, 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 50FCEBA018C72017004AD434 /* LayoutReader.cpp in Sources */, 50E6D33518E174130051CA34 /* UIHBox.cpp in Sources */, + 5034CA1C191D591100CE6051 /* ccShaders.cpp in Sources */, 500DC98F19106300007B91BF /* CCRef.cpp in Sources */, 50FCEBB018C72017004AD434 /* ScrollViewReader.cpp in Sources */, 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */, @@ -6787,6 +6809,7 @@ 46C02E0818E91123004B7456 /* xxhash.c in Sources */, 500DC95D19106300007B91BF /* CCEventKeyboard.cpp in Sources */, 2905FA4118CF08D100240AA3 /* CocosGUI.cpp in Sources */, + 5034CA20191D591100CE6051 /* CCGLProgramCache.cpp in Sources */, 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */, 1A8C59DC180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */, 1A8C59E0180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */, @@ -6795,12 +6818,14 @@ 1A8C59EC180E930E00EF57C3 /* CCSkin.cpp in Sources */, 2905FA4718CF08D100240AA3 /* UIButton.cpp in Sources */, 1A8C59F0180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, + 1A1645B1191B726C008C7C7F /* ConvertUTF.c in Sources */, B2AF2FA218EBAEAE00C5807C /* Vector2.cpp in Sources */, 500DC8D219105F7D007B91BF /* CCAffineTransform.cpp in Sources */, 1A8C59F4180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */, 1A8C59F8180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */, 1A8C59FC180E930E00EF57C3 /* CCTween.cpp in Sources */, 2905FA5318CF08D100240AA3 /* UIImageView.cpp in Sources */, + 1A1645B3191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, 1A8C5A04180E930E00EF57C3 /* CCUtilMath.cpp in Sources */, 2905FA7518CF08D100240AA3 /* UIScrollView.cpp in Sources */, 1A8C5A0E180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 52d75cef22..5282890068 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -1426,7 +1426,7 @@ 1AC3599018CECF0B00F37B72 /* ChipmunkTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChipmunkTest.h; sourceTree = ""; }; 1AC3599218CECF0B00F37B72 /* ClickAndMoveTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClickAndMoveTest.cpp; sourceTree = ""; }; 1AC3599318CECF0B00F37B72 /* ClickAndMoveTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClickAndMoveTest.h; sourceTree = ""; }; - 1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClippingNodeTest.cpp; sourceTree = ""; }; + 1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ClippingNodeTest.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1AC3599618CECF0B00F37B72 /* ClippingNodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClippingNodeTest.h; sourceTree = ""; }; 1AC3599818CECF0B00F37B72 /* CocosDenshionTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocosDenshionTest.cpp; sourceTree = ""; }; 1AC3599918CECF0B00F37B72 /* CocosDenshionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocosDenshionTest.h; sourceTree = ""; }; @@ -1476,7 +1476,7 @@ 1AC359D918CECF0B00F37B72 /* TimelineCallbackLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineCallbackLayerLoader.h; sourceTree = ""; }; 1AC359DA18CECF0B00F37B72 /* TimelineCallbackTestLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineCallbackTestLayer.cpp; sourceTree = ""; }; 1AC359DB18CECF0B00F37B72 /* TimelineCallbackTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineCallbackTestLayer.h; sourceTree = ""; }; - 1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArmatureScene.cpp; sourceTree = ""; }; + 1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ArmatureScene.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1AC359DE18CECF0B00F37B72 /* ArmatureScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArmatureScene.h; sourceTree = ""; }; 1AC359E018CECF0B00F37B72 /* ComponentsTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComponentsTestScene.cpp; sourceTree = ""; }; 1AC359E118CECF0B00F37B72 /* ComponentsTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComponentsTestScene.h; sourceTree = ""; }; @@ -1543,7 +1543,7 @@ 1AC35A9D18CECF0B00F37B72 /* KeyboardTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardTest.h; sourceTree = ""; }; 1AC35A9F18CECF0B00F37B72 /* KeypadTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeypadTest.cpp; sourceTree = ""; }; 1AC35AA018CECF0B00F37B72 /* KeypadTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeypadTest.h; sourceTree = ""; }; - 1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTest.cpp; sourceTree = ""; }; + 1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LabelTest.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1AC35AA318CECF0C00F37B72 /* LabelTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTest.h; sourceTree = ""; }; 1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTestNew.cpp; sourceTree = ""; }; 1AC35AA518CECF0C00F37B72 /* LabelTestNew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTestNew.h; sourceTree = ""; }; @@ -1553,13 +1553,13 @@ 1AC35AAB18CECF0C00F37B72 /* MenuTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuTest.h; sourceTree = ""; }; 1AC35AAD18CECF0C00F37B72 /* MotionStreakTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MotionStreakTest.cpp; sourceTree = ""; }; 1AC35AAE18CECF0C00F37B72 /* MotionStreakTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MotionStreakTest.h; sourceTree = ""; }; - 1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutiTouchTest.cpp; sourceTree = ""; }; + 1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = MutiTouchTest.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1AC35AB118CECF0C00F37B72 /* MutiTouchTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutiTouchTest.h; sourceTree = ""; }; 1AC35AB318CECF0C00F37B72 /* NewEventDispatcherTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewEventDispatcherTest.cpp; sourceTree = ""; }; 1AC35AB418CECF0C00F37B72 /* NewEventDispatcherTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewEventDispatcherTest.h; sourceTree = ""; }; 1AC35AB618CECF0C00F37B72 /* NewRendererTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewRendererTest.cpp; sourceTree = ""; }; 1AC35AB718CECF0C00F37B72 /* NewRendererTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewRendererTest.h; sourceTree = ""; }; - 1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodeTest.cpp; sourceTree = ""; }; + 1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = NodeTest.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1AC35ABA18CECF0C00F37B72 /* NodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeTest.h; sourceTree = ""; }; 1AC35ABC18CECF0C00F37B72 /* ParallaxTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParallaxTest.cpp; sourceTree = ""; }; 1AC35ABD18CECF0C00F37B72 /* ParallaxTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallaxTest.h; sourceTree = ""; }; @@ -1607,7 +1607,7 @@ 1AC35AF018CECF0C00F37B72 /* ShaderTest2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShaderTest2.h; sourceTree = ""; }; 1AC35AF218CECF0C00F37B72 /* SpineTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpineTest.cpp; sourceTree = ""; }; 1AC35AF318CECF0C00F37B72 /* SpineTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpineTest.h; sourceTree = ""; }; - 1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpriteTest.cpp; sourceTree = ""; }; + 1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = SpriteTest.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1AC35AF618CECF0C00F37B72 /* SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteTest.h; sourceTree = ""; }; 1AC35AF718CECF0C00F37B72 /* testBasic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testBasic.cpp; sourceTree = ""; }; 1AC35AF818CECF0C00F37B72 /* testBasic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testBasic.h; sourceTree = ""; }; @@ -1852,6 +1852,8 @@ 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoPlayerTest.cpp; sourceTree = ""; }; 3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayerTest.h; sourceTree = ""; }; 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = ""; }; + 70A7F72D191D3E4900F0F206 /* shaderTest.psh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = shaderTest.psh.h; sourceTree = ""; }; + 70A7F730191D421B00F0F206 /* ShaderTest.vsh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShaderTest.vsh.h; sourceTree = ""; }; A035A71117822E9E00987F6C /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; A07A52291783A1D20073F6A7 /* cpp-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A52B71783AE6D0073F6A7 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; @@ -3092,6 +3094,8 @@ 1AC35AEE18CECF0C00F37B72 /* ShaderTest.h */, 1AC35AEF18CECF0C00F37B72 /* ShaderTest2.cpp */, 1AC35AF018CECF0C00F37B72 /* ShaderTest2.h */, + 70A7F72D191D3E4900F0F206 /* shaderTest.psh.h */, + 70A7F730191D421B00F0F206 /* ShaderTest.vsh.h */, ); path = ShaderTest; sourceTree = ""; diff --git a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj index 28de39bf4a..cbc702706c 100644 --- a/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj +++ b/build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj @@ -119,7 +119,7 @@ $(IntDir)pch.pch $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) - 4453;28204 + 4453;28204;4996; WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions) NotUsing @@ -134,7 +134,7 @@ $(IntDir)pch.pch $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) - 4453;28204 + 4453;28204;4996; WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions) NotUsing @@ -149,7 +149,7 @@ $(IntDir)pch.pch $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) - 4453;28204 + 4453;28204;4996; WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions) NotUsing @@ -164,7 +164,7 @@ $(IntDir)pch.pch $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) - 4453;28204 + 4453;28204;4996; WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions) NotUsing @@ -179,7 +179,7 @@ $(IntDir)pch.pch $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) - 4453;28204 + 4453;28204;4996; WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions) NotUsing @@ -194,7 +194,7 @@ $(IntDir)pch.pch $(ProjectDir);$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) - 4453;28204 + 4453;28204;4996; WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions) NotUsing diff --git a/cocos/2d/CCAtlasNode.cpp b/cocos/2d/CCAtlasNode.cpp index 64e36f5956..3403bf51e8 100644 --- a/cocos/2d/CCAtlasNode.cpp +++ b/cocos/2d/CCAtlasNode.cpp @@ -29,12 +29,12 @@ THE SOFTWARE. #include "2d/CCTextureAtlas.h" #include "2d/CCTextureCache.h" #include "base/CCDirector.h" -#include "2d/CCGLProgram.h" -#include "2d/CCShaderCache.h" -#include "2d/ccGLStateCache.h" #include "base/CCDirector.h" -#include "math/TransformUtils.h" #include "renderer/CCRenderer.h" +#include "renderer/CCGLProgram.h" +#include "renderer/CCGLProgramState.h" +#include "renderer/ccGLStateCache.h" +#include "math/TransformUtils.h" NS_CC_BEGIN @@ -106,7 +106,7 @@ bool AtlasNode::initWithTexture(Texture2D* texture, int tileWidth, int tileHeigh _quadsToDraw = itemsToRender; // shader stuff - setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP)); + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP)); return true; } @@ -138,7 +138,7 @@ void AtlasNode::draw(Renderer *renderer, const Matrix &transform, bool transform _quadCommand.init( _globalZOrder, _textureAtlas->getTexture()->getName(), - _shaderProgram, + getGLProgramState(), _blendFunc, _textureAtlas->getQuads(), _quadsToDraw, diff --git a/cocos/2d/CCClippingNode.cpp b/cocos/2d/CCClippingNode.cpp index a1687400fa..f82fa5231d 100644 --- a/cocos/2d/CCClippingNode.cpp +++ b/cocos/2d/CCClippingNode.cpp @@ -26,8 +26,8 @@ */ #include "2d/CCClippingNode.h" -#include "2d/CCGLProgram.h" -#include "2d/CCShaderCache.h" +#include "renderer/CCGLProgram.h" +#include "renderer/CCGLProgramCache.h" #include "2d/CCDrawingPrimitives.h" #include "base/CCDirector.h" @@ -45,7 +45,7 @@ static GLint s_layer = -1; static void setProgram(Node *n, GLProgram *p) { - n->setShaderProgram(p); + n->setGLProgram(p); auto& children = n->getChildren(); for(const auto &child : children) { @@ -237,7 +237,7 @@ void ClippingNode::visit(Renderer *renderer, const Matrix &parentTransform, bool #else // since glAlphaTest do not exists in OES, use a shader that writes // pixel only if greater than an alpha threshold - GLProgram *program = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST_NO_MV); + GLProgram *program = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST_NO_MV); GLint alphaValueLocation = glGetUniformLocation(program->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE); // set our alphaThreshold program->use(); diff --git a/cocos/2d/CCDrawNode.cpp b/cocos/2d/CCDrawNode.cpp index 48408b3133..666cf80d35 100644 --- a/cocos/2d/CCDrawNode.cpp +++ b/cocos/2d/CCDrawNode.cpp @@ -22,12 +22,12 @@ */ #include "2d/CCDrawNode.h" -#include "2d/CCShaderCache.h" #include "CCGL.h" #include "base/CCEventType.h" #include "base/CCConfiguration.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCRenderer.h" +#include "renderer/CCGLProgramState.h" #include "base/CCDirector.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventDispatcher.h" @@ -158,7 +158,7 @@ bool DrawNode::init() { _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; - setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_LENGTH_TEXTURE_COLOR)); + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_LENGTH_TEXTURE_COLOR)); ensureCapacity(512); @@ -178,8 +178,8 @@ bool DrawNode::init() glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, colors)); - glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, texCoords)); + glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORD); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, texCoords)); glBindBuffer(GL_ARRAY_BUFFER, 0); @@ -214,8 +214,9 @@ void DrawNode::draw(Renderer *renderer, const Matrix &transform, bool transformU void DrawNode::onDraw(const Matrix &transform, bool transformUpdated) { - getShaderProgram()->use(); - getShaderProgram()->setUniformsForBuiltins(transform); + auto glProgram = getGLProgram(); + glProgram->use(); + glProgram->setUniformsForBuiltins(transform); GL::blendFunc(_blendFunc.src, _blendFunc.dst); @@ -241,7 +242,7 @@ void DrawNode::onDraw(const Matrix &transform, bool transformUpdated) glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, colors)); // texcood - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, texCoords)); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, texCoords)); } glDrawArrays(GL_TRIANGLES, 0, _bufferCount); diff --git a/cocos/2d/CCDrawingPrimitives.cpp b/cocos/2d/CCDrawingPrimitives.cpp index 7a591a2ca4..3af2401d45 100644 --- a/cocos/2d/CCDrawingPrimitives.cpp +++ b/cocos/2d/CCDrawingPrimitives.cpp @@ -45,9 +45,9 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "CCGL.h" #include "base/CCDirector.h" -#include "2d/ccGLStateCache.h" -#include "2d/CCShaderCache.h" -#include "2d/CCGLProgram.h" +#include "renderer/ccGLStateCache.h" +#include "renderer/CCGLProgramCache.h" +#include "renderer/CCGLProgram.h" #include "2d/CCActionCatmullRom.h" #include "renderer/CCRenderer.h" @@ -99,7 +99,7 @@ static void lazy_init( void ) // // Position and 1 color passed as a uniform (to simulate glColor4ub ) // - s_shader = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_U_COLOR); + s_shader = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_U_COLOR); s_shader->retain(); s_colorLocation = s_shader->getUniformLocation("u_color"); diff --git a/cocos/2d/CCFont.cpp b/cocos/2d/CCFont.cpp index 1a158af323..8e18fc4a66 100644 --- a/cocos/2d/CCFont.cpp +++ b/cocos/2d/CCFont.cpp @@ -100,47 +100,6 @@ const char * Font::getCurrentGlyphCollection() const } } -unsigned short* Font::getUTF16Text(const char *text, int &outNumLetters) const -{ - unsigned short* utf16String = cc_utf8_to_utf16(text); - - if(!utf16String) - return 0; - - outNumLetters = cc_wcslen(utf16String); - return utf16String; -} - -int Font::getUTF16TextLenght(unsigned short int *text) const -{ - return cc_wcslen(text); -} - -unsigned short * Font::trimUTF16Text(unsigned short int *text, int newBegin, int newEnd) const -{ - if ( newBegin < 0 || newEnd <= 0 ) - return 0; - - if ( newBegin >= newEnd ) - return 0; - - if (newEnd >= cc_wcslen(text)) - return 0; - - int newLenght = newEnd - newBegin + 2; - unsigned short* trimmedString = new unsigned short[newLenght]; - - for(int c = 0; c < (newLenght - 1); ++c) - { - trimmedString[c] = text[newBegin + c]; - } - - // last char - trimmedString[newLenght-1] = 0x0000; - - // done - return trimmedString; -} NS_CC_END diff --git a/cocos/2d/CCFont.h b/cocos/2d/CCFont.h index 1fd7859b70..d11acc2f09 100644 --- a/cocos/2d/CCFont.h +++ b/cocos/2d/CCFont.h @@ -41,16 +41,12 @@ class CC_DLL Font : public Ref public: virtual FontAtlas *createFontAtlas() = 0; - virtual int* getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const = 0; + virtual int* getHorizontalKerningForTextUTF16(const std::u16string& text, int &outNumLetters) const = 0; virtual const char* getCurrentGlyphCollection() const; virtual int getFontMaxHeight() const { return 0; } - virtual int getUTF16TextLenght(unsigned short int *text) const; - virtual unsigned short * getUTF16Text(const char *text, int &outNumLetters) const; - virtual unsigned short * trimUTF16Text(unsigned short int *text, int newBegin, int newEnd) const; - protected: Font(); diff --git a/cocos/2d/CCFontAtlas.cpp b/cocos/2d/CCFontAtlas.cpp index fd2d32e1c1..0b98028855 100644 --- a/cocos/2d/CCFontAtlas.cpp +++ b/cocos/2d/CCFontAtlas.cpp @@ -202,7 +202,7 @@ void FontAtlas::addLetterDefinition(const FontLetterDefinition &letterDefinition _fontLetterDefinitions[letterDefinition.letteCharUTF16] = letterDefinition; } -bool FontAtlas::getLetterDefinitionForChar(unsigned short letteCharUTF16, FontLetterDefinition &outDefinition) +bool FontAtlas::getLetterDefinitionForChar(char16_t letteCharUTF16, FontLetterDefinition &outDefinition) { auto outIterator = _fontLetterDefinitions.find(letteCharUTF16); @@ -218,13 +218,13 @@ bool FontAtlas::getLetterDefinitionForChar(unsigned short letteCharUTF16, FontL } } -bool FontAtlas::prepareLetterDefinitions(unsigned short *utf16String) +bool FontAtlas::prepareLetterDefinitions(const std::u16string& utf16String) { FontFreeType* fontTTf = dynamic_cast(_font); - if(fontTTf == nullptr || utf16String == nullptr) + if(fontTTf == nullptr) return false; - int length = cc_wcslen(utf16String); + size_t length = utf16String.length(); float offsetAdjust = _letterPadding / 2; long bitmapWidth; @@ -240,7 +240,7 @@ bool FontAtlas::prepareLetterDefinitions(unsigned short *utf16String) float startY = _currentPageOrigY; - for (int i = 0; i < length; ++i) + for (size_t i = 0; i < length; ++i) { auto outIterator = _fontLetterDefinitions.find(utf16String[i]); diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index 78c9b44d6e..f55c6938d9 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/cocos/2d/CCFontAtlas.h @@ -25,10 +25,11 @@ #ifndef _CCFontAtlas_h_ #define _CCFontAtlas_h_ -#include #include "base/CCPlatformMacros.h" #include "base/CCRef.h" #include "CCStdC.h" +#include +#include NS_CC_BEGIN @@ -71,9 +72,9 @@ public: virtual ~FontAtlas(); void addLetterDefinition(const FontLetterDefinition &letterDefinition); - bool getLetterDefinitionForChar(unsigned short letteCharUTF16, FontLetterDefinition &outDefinition); + bool getLetterDefinitionForChar(char16_t letteCharUTF16, FontLetterDefinition &outDefinition); - bool prepareLetterDefinitions(unsigned short *utf16String); + bool prepareLetterDefinitions(const std::u16string& utf16String); inline const std::unordered_map& getTextures() const{ return _atlasTextures;} void addTexture(Texture2D *texture, int slot); diff --git a/cocos/2d/CCFontCharMap.cpp b/cocos/2d/CCFontCharMap.cpp index 1200118bb5..75e802e31e 100644 --- a/cocos/2d/CCFontCharMap.cpp +++ b/cocos/2d/CCFontCharMap.cpp @@ -99,12 +99,9 @@ FontCharMap::~FontCharMap() } -int * FontCharMap::getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const +int * FontCharMap::getHorizontalKerningForTextUTF16(const std::u16string& text, int &outNumLetters) const { - if (!text) - return 0; - - outNumLetters = cc_wcslen(text); + outNumLetters = static_cast(text.length()); if (!outNumLetters) return 0; diff --git a/cocos/2d/CCFontCharMap.h b/cocos/2d/CCFontCharMap.h index d91d12e2bc..76b4fb7e10 100644 --- a/cocos/2d/CCFontCharMap.h +++ b/cocos/2d/CCFontCharMap.h @@ -37,7 +37,7 @@ public: static FontCharMap * create(Texture2D* texture, int itemWidth, int itemHeight, int startCharMap); static FontCharMap * create(const std::string& plistFile); - virtual int* getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const override; + virtual int* getHorizontalKerningForTextUTF16(const std::u16string& text, int &outNumLetters) const override; virtual FontAtlas *createFontAtlas() override; protected: diff --git a/cocos/2d/CCFontFNT.cpp b/cocos/2d/CCFontFNT.cpp index 0792daf094..714567cad4 100644 --- a/cocos/2d/CCFontFNT.cpp +++ b/cocos/2d/CCFontFNT.cpp @@ -711,12 +711,9 @@ void FontFNT::purgeCachedData() } } -int * FontFNT::getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const +int * FontFNT::getHorizontalKerningForTextUTF16(const std::u16string& text, int &outNumLetters) const { - if (!text) - return 0; - - outNumLetters = cc_wcslen(text); + outNumLetters = static_cast(text.length()); if (!outNumLetters) return 0; diff --git a/cocos/2d/CCFontFNT.h b/cocos/2d/CCFontFNT.h index 3b6d036be2..fb32fbc4fe 100644 --- a/cocos/2d/CCFontFNT.h +++ b/cocos/2d/CCFontFNT.h @@ -42,7 +42,7 @@ public: Removes from memory the cached configurations and the atlas name dictionary. */ static void purgeCachedData(); - virtual int* getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const override; + virtual int* getHorizontalKerningForTextUTF16(const std::u16string& text, int &outNumLetters) const override; virtual FontAtlas *createFontAtlas() override; protected: diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index a36d2b9db7..588bb4b4ac 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -175,20 +175,22 @@ FontAtlas * FontFreeType::createFontAtlas() FontAtlas *atlas = new FontAtlas(*this); if (_usedGlyphs != GlyphCollection::DYNAMIC) { - unsigned short* utf16 = cc_utf8_to_utf16(getCurrentGlyphCollection()); - atlas->prepareLetterDefinitions(utf16); - CC_SAFE_DELETE_ARRAY(utf16); + std::u16string utf16; + if (StringUtils::UTF8ToUTF16(getCurrentGlyphCollection(), utf16)) + { + atlas->prepareLetterDefinitions(utf16); + } } this->release(); return atlas; } -int * FontFreeType::getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const +int * FontFreeType::getHorizontalKerningForTextUTF16(const std::u16string& text, int &outNumLetters) const { - if (!text || !_fontRef) + if (!_fontRef) return nullptr; - outNumLetters = cc_wcslen(text); + outNumLetters = static_cast(text.length()); if (!outNumLetters) return nullptr; diff --git a/cocos/2d/CCFontFreeType.h b/cocos/2d/CCFontFreeType.h index ece5c6dbf4..9c38e979b8 100644 --- a/cocos/2d/CCFontFreeType.h +++ b/cocos/2d/CCFontFreeType.h @@ -62,7 +62,7 @@ public: void renderCharAt(unsigned char *dest,int posX, int posY, unsigned char* bitmap,long bitmapWidth,long bitmapHeight); virtual FontAtlas * createFontAtlas() override; - virtual int * getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const override; + virtual int * getHorizontalKerningForTextUTF16(const std::u16string& text, int &outNumLetters) const override; unsigned char * getGlyphBitmap(unsigned short theChar, long &outWidth, long &outHeight, Rect &outRect,int &xAdvance); diff --git a/cocos/2d/CCGrid.cpp b/cocos/2d/CCGrid.cpp index 968a0dccd2..96f927363a 100644 --- a/cocos/2d/CCGrid.cpp +++ b/cocos/2d/CCGrid.cpp @@ -23,16 +23,17 @@ 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. ****************************************************************************/ + #include "base/ccMacros.h" -#include "2d/CCGrid.h" #include "base/CCDirector.h" -#include "CCGrabber.h" +#include "2d/CCGrabber.h" #include "2d/ccUtils.h" -#include "2d/CCGLProgram.h" -#include "2d/CCShaderCache.h" -#include "2d/ccGLStateCache.h" -#include "CCGL.h" +#include "2d/CCGrid.h" +#include "renderer/CCGLProgram.h" +#include "renderer/CCGLProgramCache.h" +#include "renderer/ccGLStateCache.h" #include "renderer/CCRenderer.h" +#include "CCGL.h" #include "math/TransformUtils.h" NS_CC_BEGIN @@ -102,7 +103,7 @@ bool GridBase::initWithSize(const Size& gridSize, Texture2D *texture, bool flipp ret = false; } - _shaderProgram = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE); + _shaderProgram = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE); calculateVertexPoints(); return ret; @@ -313,7 +314,7 @@ void Grid3D::blit(void) { int n = _gridSize.width * _gridSize.height; - GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_TEX_COORDS ); + GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_TEX_COORD ); _shaderProgram->use(); _shaderProgram->setUniformsForBuiltins();; @@ -330,7 +331,7 @@ void Grid3D::blit(void) // texCoords setGLBufferData(_texCoordinates, numOfPoints * sizeof(Vector2), 1); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, 0, 0); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, 0); setGLIndexData(_indices, n * 12, 0); glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, 0); @@ -339,7 +340,7 @@ void Grid3D::blit(void) glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _vertices); // texCoords - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates); glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, _indices); #endif // EMSCRIPTEN @@ -535,7 +536,7 @@ void TiledGrid3D::blit(void) // // Attributes // - GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_TEX_COORDS ); + GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_TEX_COORD ); #ifdef EMSCRIPTEN int numQuads = _gridSize.width * _gridSize.height; @@ -545,7 +546,7 @@ void TiledGrid3D::blit(void) // texCoords setGLBufferData(_texCoordinates, (numQuads*4*sizeof(Vector2)), 1); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, 0, 0); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, 0); setGLIndexData(_indices, n * 12, 0); glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, 0); @@ -554,7 +555,7 @@ void TiledGrid3D::blit(void) glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _vertices); // texCoords - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates); glDrawElements(GL_TRIANGLES, (GLsizei)n*6, GL_UNSIGNED_SHORT, _indices); #endif // EMSCRIPTEN diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 746944c579..7e990b7e28 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -25,22 +25,23 @@ #include "2d/CCLabel.h" #include "2d/CCFontAtlasCache.h" -#include "CCLabelTextFormatter.h" #include "2d/CCSprite.h" -#include "2d/CCShaderCache.h" -#include "ccUTF8.h" +#include "2d/CCLabelTextFormatter.h" +#include "2d/ccUTF8.h" #include "2d/CCSpriteFrame.h" -#include "base/CCDirector.h" +#include "2d/platform/CCFileUtils.h" +#include "2d/CCFont.h" +#include "renderer/CCGLProgramState.h" #include "renderer/CCRenderer.h" -#include "CCFont.h" +#include "base/CCDirector.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventDispatcher.h" #include "base/CCEventType.h" #include "base/CCEventCustom.h" -#include "2d/platform/CCFileUtils.h" -#include "deprecated/CCString.h" #include "base/CCProfiling.h" +#include "deprecated/CCString.h" + NS_CC_BEGIN const int Label::DistanceFieldFontSize = 50; @@ -246,8 +247,6 @@ Label::Label(FontAtlas *atlas /* = nullptr */, TextHAlignment hAlignment /* = Te , _labelDimensions(Size::ZERO) , _hAlignment(hAlignment) , _vAlignment(vAlignment) -, _currentUTF16String(nullptr) -, _originalUTF16String(nullptr) , _horizontalKernings(nullptr) , _fontAtlas(atlas) , _isOpacityModifyRGB(false) @@ -286,9 +285,7 @@ Label::Label(FontAtlas *atlas /* = nullptr */, TextHAlignment hAlignment /* = Te } Label::~Label() -{ - delete [] _currentUTF16String; - delete [] _originalUTF16String; +{ delete [] _horizontalKernings; if (_fontAtlas) @@ -304,7 +301,7 @@ void Label::reset() TTFConfig temp; _fontConfig = temp; - _fontDirty = false; + _systemFontDirty = false; _systemFont = "Helvetica"; _systemFontSize = 12; @@ -342,29 +339,29 @@ void Label::updateShaderProgram() { case cocos2d::LabelEffect::NORMAL: if (_useDistanceField) - setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_NORMAL)); + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_NORMAL)); else if (_useA8Shader) - setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_LABEL_NORMAL)); + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_LABEL_NORMAL)); else - setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR)); + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR)); break; case cocos2d::LabelEffect::OUTLINE: - setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_LABEL_OUTLINE)); - _uniformEffectColor = glGetUniformLocation(_shaderProgram->getProgram(), "v_effectColor"); + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_LABEL_OUTLINE)); + _uniformEffectColor = glGetUniformLocation(getGLProgram()->getProgram(), "v_effectColor"); break; case cocos2d::LabelEffect::GLOW: if (_useDistanceField) { - setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_GLOW)); - _uniformEffectColor = glGetUniformLocation(_shaderProgram->getProgram(), "v_effectColor"); + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_GLOW)); + _uniformEffectColor = glGetUniformLocation(getGLProgram()->getProgram(), "v_effectColor"); } break; default: return; } - _uniformTextColor = glGetUniformLocation(_shaderProgram->getProgram(), "v_textColor"); + _uniformTextColor = glGetUniformLocation(getGLProgram()->getProgram(), "v_textColor"); } void Label::setFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled /* = false */, bool useA8Shader /* = false */) @@ -475,6 +472,12 @@ void Label::setString(const std::string& text) { _originalUTF8String = text; _contentDirty = true; + + std::u16string utf16String; + if (StringUtils::UTF8ToUTF16(_originalUTF8String, utf16String)) + { + _currentUTF16String = utf16String; + } } void Label::setAlignment(TextHAlignment hAlignment,TextVAlignment vAlignment) @@ -573,7 +576,7 @@ float Label::getScaleX() const void Label::alignText() { - if (_fontAtlas == nullptr || _currentUTF16String == nullptr) + if (_fontAtlas == nullptr || _currentUTF16String.empty()) { return; } @@ -602,7 +605,7 @@ void Label::alignText() if(_labelWidth > 0 || (_currNumLines > 1 && _hAlignment != TextHAlignment::LEFT)) LabelTextFormatter::alignText(this); - int strLen = cc_wcslen(_currentUTF16String); + int strLen = static_cast(_currentUTF16String.length()); Rect uvRect; Sprite* letterSprite; for(const auto &child : _children) { @@ -632,7 +635,7 @@ void Label::alignText() updateColor(); } -bool Label::computeHorizontalKernings(unsigned short int *stringToRender) +bool Label::computeHorizontalKernings(const std::u16string& stringToRender) { if (_horizontalKernings) { @@ -649,41 +652,6 @@ bool Label::computeHorizontalKernings(unsigned short int *stringToRender) return true; } -bool Label::setOriginalString(unsigned short *stringToSet) -{ - if (_originalUTF16String) - { - delete [] _originalUTF16String; - } - - int newStringLenght = cc_wcslen(stringToSet); - _originalUTF16String = new unsigned short int [newStringLenght + 1]; - memset(_originalUTF16String, 0, (newStringLenght + 1) * 2); - memcpy(_originalUTF16String, stringToSet, (newStringLenght * 2)); - _originalUTF16String[newStringLenght] = 0; - - return true; -} - -bool Label::setCurrentString(unsigned short *stringToSet) -{ - // set the new string - if (_currentUTF16String) - { - delete [] _currentUTF16String; - } - - _currentUTF16String = stringToSet; - computeStringNumLines(); - - // compute the advances - if (_fontAtlas) - { - computeHorizontalKernings(stringToSet); - } - return true; -} - void Label::updateQuads() { int index; @@ -846,18 +814,19 @@ void Label::onDraw(const Matrix& transform, bool transformUpdated) return; } - _shaderProgram->use(); + auto glprogram = getGLProgram(); + glprogram->use(); GL::blendFunc( _blendFunc.src, _blendFunc.dst ); if (_currentLabelType == LabelType::TTF) { - _shaderProgram->setUniformLocationWith4f(_uniformTextColor, + glprogram->setUniformLocationWith4f(_uniformTextColor, _textColorF.r,_textColorF.g,_textColorF.b,_textColorF.a); } if (_currLabelEffect == LabelEffect::OUTLINE || _currLabelEffect == LabelEffect::GLOW) { - _shaderProgram->setUniformLocationWith4f(_uniformEffectColor, + glprogram->setUniformLocationWith4f(_uniformEffectColor, _effectColorF.r,_effectColorF.g,_effectColorF.b,_effectColorF.a); } @@ -866,7 +835,7 @@ void Label::onDraw(const Matrix& transform, bool transformUpdated) drawShadowWithoutBlur(); } - _shaderProgram->setUniformsForBuiltins(transform); + glprogram->setUniformsForBuiltins(transform); for(const auto &child: _children) { @@ -889,7 +858,7 @@ void Label::drawShadowWithoutBlur() _displayedOpacity = _shadowOpacity * _displayedOpacity; setColor(_shadowColor); - _shaderProgram->setUniformsForBuiltins(_shadowTransform); + getGLProgram()->setUniformsForBuiltins(_shadowTransform); for(const auto &child: _children) { child->updateTransform(); @@ -957,9 +926,17 @@ void Label::setFontDefinition(const FontDefinition& textDefinition) void Label::updateContent() { - auto utf16String = cc_utf8_to_utf16(_originalUTF8String.c_str()); - setCurrentString(utf16String); - setOriginalString(utf16String); + std::u16string utf16String; + if (StringUtils::UTF8ToUTF16(_originalUTF8String, utf16String)) + { + _currentUTF16String = utf16String; + } + + computeStringNumLines(); + if (_fontAtlas) + { + computeHorizontalKernings(_currentUTF16String); + } if (_textSprite) { @@ -1034,7 +1011,7 @@ void Label::updateFont() } _contentDirty = true; - _fontDirty = false; + _systemFontDirty = false; } void Label::drawTextSprite(Renderer *renderer, bool parentTransformUpdated) @@ -1073,7 +1050,7 @@ void Label::visit(Renderer *renderer, const Matrix &parentTransform, bool parent { return; } - if (_fontDirty) + if (_systemFontDirty) { updateFont(); } @@ -1134,7 +1111,7 @@ void Label::setSystemFontName(const std::string& systemFont) if (systemFont != _systemFont) { _systemFont = systemFont; - _fontDirty = true; + _systemFontDirty = true; } } @@ -1143,16 +1120,15 @@ void Label::setSystemFontSize(float fontSize) if (_systemFontSize != fontSize) { _systemFontSize = fontSize; - _fontDirty = true; + _systemFontDirty = true; } } ///// PROTOCOL STUFF Sprite * Label::getLetter(int letterIndex) { - if (_fontDirty) + if (_systemFontDirty || _currentLabelType == LabelType::STRING_TEXTURE) { - updateFont(); return nullptr; } @@ -1201,15 +1177,15 @@ void Label::computeStringNumLines() { int quantityOfLines = 1; - int stringLen = _currentUTF16String ? cc_wcslen(_currentUTF16String) : -1; - if (stringLen < 1) + if (_currentUTF16String.empty()) { - _currNumLines = stringLen; + _currNumLines = 0; return; } // count number of lines - for (int i = 0; i < stringLen - 1; ++i) + size_t stringLen = _currentUTF16String.length(); + for (size_t i = 0; i < stringLen-1; ++i) { if (_currentUTF16String[i] == '\n') { @@ -1222,7 +1198,7 @@ void Label::computeStringNumLines() int Label::getStringLength() const { - return _currentUTF16String ? cc_wcslen(_currentUTF16String) : (int)_originalUTF8String.length(); + return static_cast(_currentUTF16String.length()); } // RGBA protocol @@ -1321,12 +1297,14 @@ void Label::updateColor() std::string Label::getDescription() const { - return StringUtils::format("