mirror of https://github.com/axmolengine/axmol.git
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
This commit is contained in:
cw
commit
3207d841a3
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
6
AUTHORS
6
AUTHORS
|
|
@ -844,6 +844,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
|
||||
Author of windows port, CCTextField,
|
||||
|
|
|
|||
10
CHANGELOG
10
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
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ cocos2d-x
|
|||
=========
|
||||
|
||||
[](https://travis-ci.org/cocos2d/cocos2d-x)
|
||||
[](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++.
|
||||
|
|
|
|||
|
|
@ -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 = "<group>"; };
|
||||
1A0DB7311823827C0025743D /* CCEAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEAGLView.h; sourceTree = "<group>"; };
|
||||
1A0DB7351823828F0025743D /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = "<group>"; };
|
||||
1A1645AE191B726C008C7C7F /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ConvertUTF.c; sourceTree = "<group>"; };
|
||||
1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvertUTFWrapper.cpp; sourceTree = "<group>"; };
|
||||
1A570047180BC5A10088DEC7 /* CCAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAction.cpp; sourceTree = "<group>"; };
|
||||
1A570048180BC5A10088DEC7 /* CCAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAction.h; sourceTree = "<group>"; };
|
||||
1A570049180BC5A10088DEC7 /* CCActionCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionCamera.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -1964,25 +1968,6 @@
|
|||
1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystemQuad.h; sourceTree = "<group>"; };
|
||||
1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCScriptSupport.cpp; sourceTree = "<group>"; };
|
||||
1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCScriptSupport.h; sourceTree = "<group>"; };
|
||||
1A570239180BCC6F0088DEC7 /* ccShader_Position_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_frag.h; sourceTree = "<group>"; };
|
||||
1A57023A180BCC6F0088DEC7 /* ccShader_Position_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Position_uColor_vert.h; sourceTree = "<group>"; };
|
||||
1A57023B180BCC6F0088DEC7 /* ccShader_PositionColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_frag.h; sourceTree = "<group>"; };
|
||||
1A57023C180BCC6F0088DEC7 /* ccShader_PositionColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColor_vert.h; sourceTree = "<group>"; };
|
||||
1A57023D180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_frag.h; sourceTree = "<group>"; };
|
||||
1A57023E180BCC6F0088DEC7 /* ccShader_PositionColorLengthTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionColorLengthTexture_vert.h; sourceTree = "<group>"; };
|
||||
1A57023F180BCC6F0088DEC7 /* ccShader_PositionTexture_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_frag.h; sourceTree = "<group>"; };
|
||||
1A570240180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_frag.h; sourceTree = "<group>"; };
|
||||
1A570241180BCC6F0088DEC7 /* ccShader_PositionTexture_uColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_uColor_vert.h; sourceTree = "<group>"; };
|
||||
1A570242180BCC6F0088DEC7 /* ccShader_PositionTexture_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTexture_vert.h; sourceTree = "<group>"; };
|
||||
1A570243180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_frag.h; sourceTree = "<group>"; };
|
||||
1A570244180BCC6F0088DEC7 /* ccShader_PositionTextureA8Color_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureA8Color_vert.h; sourceTree = "<group>"; };
|
||||
1A570245180BCC6F0088DEC7 /* ccShader_PositionTextureColor_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_frag.h; sourceTree = "<group>"; };
|
||||
1A570246180BCC6F0088DEC7 /* ccShader_PositionTextureColor_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_vert.h; sourceTree = "<group>"; };
|
||||
1A570247180BCC6F0088DEC7 /* ccShader_PositionTextureColorAlphaTest_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColorAlphaTest_frag.h; sourceTree = "<group>"; };
|
||||
1A570248180BCC6F0088DEC7 /* CCShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCShaderCache.cpp; sourceTree = "<group>"; };
|
||||
1A570249180BCC6F0088DEC7 /* CCShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShaderCache.h; sourceTree = "<group>"; };
|
||||
1A57024B180BCC6F0088DEC7 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = "<group>"; };
|
||||
1A57024C180BCC6F0088DEC7 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = "<group>"; };
|
||||
1A570276180BCC900088DEC7 /* CCSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCSprite.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
|
||||
1A570277180BCC900088DEC7 /* CCSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite.h; sourceTree = "<group>"; };
|
||||
1A570278180BCC900088DEC7 /* CCSpriteBatchNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSpriteBatchNode.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -2055,10 +2040,6 @@
|
|||
1A5703BA180BD2800088DEC7 /* libwebp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebp.a; sourceTree = "<group>"; };
|
||||
1A57052A180BD31F0088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = "<group>"; };
|
||||
1A57052D180BD3280088DEC7 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = "<group>"; };
|
||||
1A57052F180BD9500088DEC7 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = "<group>"; };
|
||||
1A570530180BD9500088DEC7 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = "<group>"; };
|
||||
1A570531180BD9500088DEC7 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = "<group>"; };
|
||||
1A570532180BD9500088DEC7 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = "<group>"; };
|
||||
1A57FFF7180BC5160088DEC7 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; name = CHANGELOG; path = ../CHANGELOG; sourceTree = "<group>"; };
|
||||
1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCActionFrame.cpp; sourceTree = "<group>"; };
|
||||
1A8C5949180E930E00EF57C3 /* CCActionFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionFrame.h; sourceTree = "<group>"; };
|
||||
|
|
@ -2129,11 +2110,6 @@
|
|||
1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLBufferedNode.h; sourceTree = "<group>"; };
|
||||
1A9DCA05180E6955007A3AD4 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtocols.h; sourceTree = "<group>"; };
|
||||
1A9DCA0C180E6955007A3AD4 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firePngData.h; sourceTree = "<group>"; };
|
||||
1AA95FD918EBB8EF00AE7485 /* ccShader_Label_frag_df_glow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df_glow.h; sourceTree = "<group>"; };
|
||||
1AA95FDA18EBB8EF00AE7485 /* ccShader_Label_frag_df.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_df.h; sourceTree = "<group>"; };
|
||||
1AA95FDB18EBB8EF00AE7485 /* ccShader_Label_frag_normal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_normal.h; sourceTree = "<group>"; };
|
||||
1AA95FDC18EBB8EF00AE7485 /* ccShader_Label_frag_outline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_frag_outline.h; sourceTree = "<group>"; };
|
||||
1AA95FDD18EBB8EF00AE7485 /* ccShader_Label_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_Label_vert.h; sourceTree = "<group>"; };
|
||||
1AAF5351180E3060000584C8 /* AssetsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssetsManager.cpp; sourceTree = "<group>"; };
|
||||
1AAF5352180E3060000584C8 /* AssetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetsManager.h; sourceTree = "<group>"; };
|
||||
1AAF5362180E3374000584C8 /* HttpClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClient.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -2153,6 +2129,7 @@
|
|||
1AAF584E180E40B9000584C8 /* LocalStorageAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageAndroid.cpp; sourceTree = "<group>"; };
|
||||
1ABA68AC1888D700007D1BB4 /* CCFontCharMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFontCharMap.cpp; sourceTree = "<group>"; };
|
||||
1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFontCharMap.h; sourceTree = "<group>"; };
|
||||
1AC026991914068200FA920D /* ConvertUTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvertUTF.h; sourceTree = "<group>"; };
|
||||
1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBAnimationManager.cpp; sourceTree = "<group>"; };
|
||||
1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBAnimationManager.h; sourceTree = "<group>"; };
|
||||
1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBFileLoader.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -2262,8 +2239,6 @@
|
|||
2905F9F718CF08D000240AA3 /* UIImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIImageView.h; sourceTree = "<group>"; };
|
||||
2905F9F818CF08D000240AA3 /* UILayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayout.cpp; sourceTree = "<group>"; };
|
||||
2905F9F918CF08D000240AA3 /* UILayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayout.h; sourceTree = "<group>"; };
|
||||
2905F9FA18CF08D000240AA3 /* UILayoutDefine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutDefine.cpp; sourceTree = "<group>"; };
|
||||
2905F9FB18CF08D000240AA3 /* UILayoutDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutDefine.h; sourceTree = "<group>"; };
|
||||
2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutParameter.cpp; sourceTree = "<group>"; };
|
||||
2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutParameter.h; sourceTree = "<group>"; };
|
||||
2905F9FE18CF08D000240AA3 /* UIListView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIListView.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -2289,6 +2264,7 @@
|
|||
2905FA1218CF08D100240AA3 /* UITextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextField.h; sourceTree = "<group>"; };
|
||||
2905FA1318CF08D100240AA3 /* UIWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidget.cpp; sourceTree = "<group>"; };
|
||||
2905FA1418CF08D100240AA3 /* UIWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidget.h; sourceTree = "<group>"; };
|
||||
29080DEB191B82CE0066F8DF /* UIDeprecated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIDeprecated.h; sourceTree = "<group>"; };
|
||||
296CAD201915EC8000C64FBF /* CCEventFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventFocus.cpp; path = ../base/CCEventFocus.cpp; sourceTree = "<group>"; };
|
||||
296CAD211915EC8000C64FBF /* CCEventFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventFocus.h; path = ../base/CCEventFocus.h; sourceTree = "<group>"; };
|
||||
296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerFocus.cpp; path = ../base/CCEventListenerFocus.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -2694,6 +2670,40 @@
|
|||
500DC9BB19106E89007B91BF /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = "<group>"; };
|
||||
50272538190BF1B900AAF4ED /* cocos2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = ../cocos/cocos2d.h; sourceTree = "<group>"; };
|
||||
50272539190BF1B900AAF4ED /* cocos2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2d.cpp; path = ../cocos/cocos2d.cpp; sourceTree = "<group>"; };
|
||||
5034C9F7191D591000CE6051 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = "<group>"; };
|
||||
5034C9F8191D591000CE6051 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = "<group>"; };
|
||||
5034C9F9191D591000CE6051 /* CCGLProgramCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramCache.h; sourceTree = "<group>"; };
|
||||
5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramCache.cpp; sourceTree = "<group>"; };
|
||||
5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColorAlphaTest.frag; sourceTree = "<group>"; };
|
||||
5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.vert; sourceTree = "<group>"; };
|
||||
5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.frag; sourceTree = "<group>"; };
|
||||
5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture.vert; sourceTree = "<group>"; };
|
||||
5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture_uColor.vert; sourceTree = "<group>"; };
|
||||
5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture_uColor.frag; sourceTree = "<group>"; };
|
||||
5034CA05191D591000CE6051 /* ccShader_PositionTexture.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTexture.frag; sourceTree = "<group>"; };
|
||||
5034CA06191D591000CE6051 /* ccShader_PositionColorLengthTexture.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColorLengthTexture.vert; sourceTree = "<group>"; };
|
||||
5034CA07191D591000CE6051 /* ccShader_PositionColorLengthTexture.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColorLengthTexture.frag; sourceTree = "<group>"; };
|
||||
5034CA08191D591000CE6051 /* ccShader_PositionColor.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColor.vert; sourceTree = "<group>"; };
|
||||
5034CA09191D591000CE6051 /* ccShader_PositionColor.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionColor.frag; sourceTree = "<group>"; };
|
||||
5034CA0A191D591000CE6051 /* ccShader_Position_uColor.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Position_uColor.vert; sourceTree = "<group>"; };
|
||||
5034CA0B191D591000CE6051 /* ccShader_Position_uColor.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Position_uColor.frag; sourceTree = "<group>"; };
|
||||
5034CA0C191D591000CE6051 /* ccShader_Label.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label.vert; sourceTree = "<group>"; };
|
||||
5034CA0D191D591000CE6051 /* ccShader_Label_outline.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_outline.frag; sourceTree = "<group>"; };
|
||||
5034CA0E191D591000CE6051 /* ccShader_Label_normal.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_normal.frag; sourceTree = "<group>"; };
|
||||
5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df.frag; sourceTree = "<group>"; };
|
||||
5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df_glow.frag; sourceTree = "<group>"; };
|
||||
5034CA11191D591000CE6051 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = "<group>"; };
|
||||
5034CA12191D591000CE6051 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = "<group>"; };
|
||||
5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = "<group>"; };
|
||||
5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = "<group>"; };
|
||||
5034CA15191D591000CE6051 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = "<group>"; };
|
||||
5034CA16191D591000CE6051 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = "<group>"; };
|
||||
5034CA17191D591000CE6051 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = "<group>"; };
|
||||
5034CA18191D591000CE6051 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = "<group>"; };
|
||||
5034CA60191D91CF00CE6051 /* ccShader_PositionTextureColor.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.vert; sourceTree = "<group>"; };
|
||||
5034CA61191D91CF00CE6051 /* ccShader_PositionTextureColor.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.frag; sourceTree = "<group>"; };
|
||||
5034CA62191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.vert; sourceTree = "<group>"; };
|
||||
5034CA63191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.frag; sourceTree = "<group>"; };
|
||||
50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = "<group>"; };
|
||||
50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = "<group>"; };
|
||||
50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = "<group>"; };
|
||||
|
|
@ -2764,8 +2774,6 @@
|
|||
A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = "<group>"; };
|
||||
A0053FBF189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = "<group>"; };
|
||||
A0053FC0189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = "<group>"; };
|
||||
A023FA32185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_frag.h; sourceTree = "<group>"; };
|
||||
A023FA33185198C800E10CD1 /* ccShader_PositionTextureColor_noMVP_vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShader_PositionTextureColor_noMVP_vert.h; sourceTree = "<group>"; };
|
||||
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 = "<group>";
|
||||
};
|
||||
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 = "<group>";
|
||||
};
|
||||
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 = "<group>";
|
||||
};
|
||||
1AC026971914068200FA920D /* ConvertUTF */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
1A1645AE191B726C008C7C7F /* ConvertUTF.c */,
|
||||
1AC026991914068200FA920D /* ConvertUTF.h */,
|
||||
1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */,
|
||||
);
|
||||
name = ConvertUTF;
|
||||
path = ../external/ConvertUTF;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
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 = "<group>";
|
||||
};
|
||||
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 = "<group>";
|
||||
};
|
||||
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 */,
|
||||
|
|
|
|||
|
|
@ -1426,7 +1426,7 @@
|
|||
1AC3599018CECF0B00F37B72 /* ChipmunkTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChipmunkTest.h; sourceTree = "<group>"; };
|
||||
1AC3599218CECF0B00F37B72 /* ClickAndMoveTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClickAndMoveTest.cpp; sourceTree = "<group>"; };
|
||||
1AC3599318CECF0B00F37B72 /* ClickAndMoveTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClickAndMoveTest.h; sourceTree = "<group>"; };
|
||||
1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClippingNodeTest.cpp; sourceTree = "<group>"; };
|
||||
1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ClippingNodeTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
|
||||
1AC3599618CECF0B00F37B72 /* ClippingNodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClippingNodeTest.h; sourceTree = "<group>"; };
|
||||
1AC3599818CECF0B00F37B72 /* CocosDenshionTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocosDenshionTest.cpp; sourceTree = "<group>"; };
|
||||
1AC3599918CECF0B00F37B72 /* CocosDenshionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocosDenshionTest.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1476,7 +1476,7 @@
|
|||
1AC359D918CECF0B00F37B72 /* TimelineCallbackLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineCallbackLayerLoader.h; sourceTree = "<group>"; };
|
||||
1AC359DA18CECF0B00F37B72 /* TimelineCallbackTestLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineCallbackTestLayer.cpp; sourceTree = "<group>"; };
|
||||
1AC359DB18CECF0B00F37B72 /* TimelineCallbackTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineCallbackTestLayer.h; sourceTree = "<group>"; };
|
||||
1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArmatureScene.cpp; sourceTree = "<group>"; };
|
||||
1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ArmatureScene.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
|
||||
1AC359DE18CECF0B00F37B72 /* ArmatureScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArmatureScene.h; sourceTree = "<group>"; };
|
||||
1AC359E018CECF0B00F37B72 /* ComponentsTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComponentsTestScene.cpp; sourceTree = "<group>"; };
|
||||
1AC359E118CECF0B00F37B72 /* ComponentsTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComponentsTestScene.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1543,7 +1543,7 @@
|
|||
1AC35A9D18CECF0B00F37B72 /* KeyboardTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardTest.h; sourceTree = "<group>"; };
|
||||
1AC35A9F18CECF0B00F37B72 /* KeypadTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeypadTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AA018CECF0B00F37B72 /* KeypadTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeypadTest.h; sourceTree = "<group>"; };
|
||||
1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LabelTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
|
||||
1AC35AA318CECF0C00F37B72 /* LabelTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTest.h; sourceTree = "<group>"; };
|
||||
1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTestNew.cpp; sourceTree = "<group>"; };
|
||||
1AC35AA518CECF0C00F37B72 /* LabelTestNew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTestNew.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1553,13 +1553,13 @@
|
|||
1AC35AAB18CECF0C00F37B72 /* MenuTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuTest.h; sourceTree = "<group>"; };
|
||||
1AC35AAD18CECF0C00F37B72 /* MotionStreakTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MotionStreakTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AAE18CECF0C00F37B72 /* MotionStreakTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MotionStreakTest.h; sourceTree = "<group>"; };
|
||||
1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutiTouchTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = MutiTouchTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
|
||||
1AC35AB118CECF0C00F37B72 /* MutiTouchTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutiTouchTest.h; sourceTree = "<group>"; };
|
||||
1AC35AB318CECF0C00F37B72 /* NewEventDispatcherTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewEventDispatcherTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AB418CECF0C00F37B72 /* NewEventDispatcherTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewEventDispatcherTest.h; sourceTree = "<group>"; };
|
||||
1AC35AB618CECF0C00F37B72 /* NewRendererTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewRendererTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AB718CECF0C00F37B72 /* NewRendererTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewRendererTest.h; sourceTree = "<group>"; };
|
||||
1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodeTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = NodeTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
|
||||
1AC35ABA18CECF0C00F37B72 /* NodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeTest.h; sourceTree = "<group>"; };
|
||||
1AC35ABC18CECF0C00F37B72 /* ParallaxTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParallaxTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35ABD18CECF0C00F37B72 /* ParallaxTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallaxTest.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1607,7 +1607,7 @@
|
|||
1AC35AF018CECF0C00F37B72 /* ShaderTest2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShaderTest2.h; sourceTree = "<group>"; };
|
||||
1AC35AF218CECF0C00F37B72 /* SpineTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpineTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AF318CECF0C00F37B72 /* SpineTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpineTest.h; sourceTree = "<group>"; };
|
||||
1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpriteTest.cpp; sourceTree = "<group>"; };
|
||||
1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = SpriteTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
|
||||
1AC35AF618CECF0C00F37B72 /* SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteTest.h; sourceTree = "<group>"; };
|
||||
1AC35AF718CECF0C00F37B72 /* testBasic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testBasic.cpp; sourceTree = "<group>"; };
|
||||
1AC35AF818CECF0C00F37B72 /* testBasic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testBasic.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1852,6 +1852,8 @@
|
|||
3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoPlayerTest.cpp; sourceTree = "<group>"; };
|
||||
3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayerTest.h; sourceTree = "<group>"; };
|
||||
46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
|
||||
70A7F72D191D3E4900F0F206 /* shaderTest.psh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = shaderTest.psh.h; sourceTree = "<group>"; };
|
||||
70A7F730191D421B00F0F206 /* ShaderTest.vsh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShaderTest.vsh.h; sourceTree = "<group>"; };
|
||||
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 = "<group>";
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings>4453;28204;4996;</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings>4453;28204;4996;</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
|
|
@ -149,7 +149,7 @@
|
|||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings>4453;28204;4996;</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings>4453;28204;4996;</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
|
|
@ -179,7 +179,7 @@
|
|||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings>4453;28204;4996;</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>WINRT;CC_USE_PHYSICS=0;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
|
|
@ -194,7 +194,7 @@
|
|||
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
|
||||
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings>4453;28204;4996;</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>WINRT;CC_USE_PHYSICS=0;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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<FontFreeType*>(_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]);
|
||||
|
||||
|
|
|
|||
|
|
@ -25,10 +25,11 @@
|
|||
#ifndef _CCFontAtlas_h_
|
||||
#define _CCFontAtlas_h_
|
||||
|
||||
#include <unordered_map>
|
||||
#include "base/CCPlatformMacros.h"
|
||||
#include "base/CCRef.h"
|
||||
#include "CCStdC.h"
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
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<ssize_t, Texture2D*>& getTextures() const{ return _atlasTextures;}
|
||||
void addTexture(Texture2D *texture, int slot);
|
||||
|
|
|
|||
|
|
@ -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<int>(text.length());
|
||||
|
||||
if (!outNumLetters)
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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<int>(text.length());
|
||||
|
||||
if (!outNumLetters)
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -175,20 +175,22 @@ FontAtlas * FontFreeType::createFontAtlas()
|
|||
FontAtlas *atlas = new FontAtlas(*this);
|
||||
if (_usedGlyphs != GlyphCollection::DYNAMIC)
|
||||
{
|
||||
unsigned short* utf16 = cc_utf8_to_utf16(getCurrentGlyphCollection());
|
||||
std::u16string utf16;
|
||||
if (StringUtils::UTF8ToUTF16(getCurrentGlyphCollection(), utf16))
|
||||
{
|
||||
atlas->prepareLetterDefinitions(utf16);
|
||||
CC_SAFE_DELETE_ARRAY(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<int>(text.length());
|
||||
|
||||
if (!outNumLetters)
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -287,8 +286,6 @@ 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<int>(_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<int>(_currentUTF16String.length());
|
||||
}
|
||||
|
||||
// RGBA protocol
|
||||
|
|
@ -1321,12 +1297,14 @@ void Label::updateColor()
|
|||
|
||||
std::string Label::getDescription() const
|
||||
{
|
||||
return StringUtils::format("<Label | Tag = %d, Label = '%s'>", _tag, cc_utf16_to_utf8(_currentUTF16String,-1,nullptr,nullptr));
|
||||
std::string utf8str;
|
||||
StringUtils::UTF16ToUTF8(_currentUTF16String, utf8str);
|
||||
return StringUtils::format("<Label | Tag = %d, Label = '%s'>", _tag, utf8str.c_str());
|
||||
}
|
||||
|
||||
const Size& Label::getContentSize() const
|
||||
{
|
||||
if (_fontDirty)
|
||||
if (_systemFontDirty)
|
||||
{
|
||||
const_cast<Label*>(this)->updateFont();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -286,9 +286,8 @@ protected:
|
|||
|
||||
virtual void alignText();
|
||||
|
||||
bool computeHorizontalKernings(unsigned short int *stringToRender);
|
||||
bool setCurrentString(unsigned short *stringToSet);
|
||||
bool setOriginalString(unsigned short *stringToSet);
|
||||
bool computeHorizontalKernings(const std::u16string& stringToRender);
|
||||
|
||||
void computeStringNumLines();
|
||||
|
||||
void updateQuads();
|
||||
|
|
@ -311,7 +310,7 @@ protected:
|
|||
bool _isOpacityModifyRGB;
|
||||
bool _contentDirty;
|
||||
|
||||
bool _fontDirty;
|
||||
bool _systemFontDirty;
|
||||
std::string _systemFont;
|
||||
float _systemFontSize;
|
||||
LabelType _currentLabelType;
|
||||
|
|
@ -344,8 +343,7 @@ protected:
|
|||
TextVAlignment _vAlignment;
|
||||
|
||||
int _currNumLines;
|
||||
unsigned short int * _currentUTF16String;
|
||||
unsigned short int * _originalUTF16String;
|
||||
std::u16string _currentUTF16String;
|
||||
std::string _originalUTF8String;
|
||||
|
||||
float _fontScale;
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ THE SOFTWARE.
|
|||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCDrawingPrimitives.h"
|
||||
#include "base/ccConfig.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "renderer/CCGLProgramCache.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "math/TransformUtils.h"
|
||||
#include "2d/platform/CCFileUtils.h"
|
||||
|
|
|
|||
|
|
@ -30,21 +30,17 @@
|
|||
#include "base/CCDirector.h"
|
||||
#include "2d/CCLabel.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
bool LabelTextFormatter::multilineText(Label *theLabel)
|
||||
{
|
||||
//int strLen = theLabel->getStringLength();
|
||||
auto limit = theLabel->_limitShowCount;
|
||||
|
||||
auto strWhole = theLabel->_currentUTF16String;
|
||||
|
||||
vector<unsigned short> multiline_string;
|
||||
std::vector<char16_t> multiline_string;
|
||||
multiline_string.reserve( limit );
|
||||
|
||||
vector<unsigned short> last_word;
|
||||
std::vector<char16_t> last_word;
|
||||
last_word.reserve( 25 );
|
||||
|
||||
bool isStartOfLine = false, isStartOfWord = false;
|
||||
|
|
@ -70,7 +66,7 @@ bool LabelTextFormatter::multilineText(Label *theLabel)
|
|||
tIndex = j+skip+justSkipped;
|
||||
if (strWhole[tIndex-1] == '\n')
|
||||
{
|
||||
cc_utf8_trim_ws(&last_word);
|
||||
StringUtils::trimUTF16Vector(last_word);
|
||||
|
||||
last_word.push_back('\n');
|
||||
multiline_string.insert(multiline_string.end(), last_word.begin(), last_word.end());
|
||||
|
|
@ -93,7 +89,7 @@ bool LabelTextFormatter::multilineText(Label *theLabel)
|
|||
if (tIndex >= limit)
|
||||
break;
|
||||
|
||||
unsigned short character = strWhole[tIndex];
|
||||
char16_t character = strWhole[tIndex];
|
||||
|
||||
if (!isStartOfWord)
|
||||
{
|
||||
|
|
@ -109,15 +105,15 @@ bool LabelTextFormatter::multilineText(Label *theLabel)
|
|||
|
||||
// 1) Whitespace.
|
||||
// 2) This character is non-CJK, but the last character is CJK
|
||||
bool isspace = isspace_unicode(character);
|
||||
bool isspace = StringUtils::isUnicodeSpace(character);
|
||||
bool isCJK = false;
|
||||
if(!isspace)
|
||||
{
|
||||
isCJK = iscjk_unicode(character);
|
||||
isCJK = StringUtils::isCJKUnicode(character);
|
||||
}
|
||||
|
||||
if (isspace ||
|
||||
(!last_word.empty() && iscjk_unicode(last_word.back()) && !isCJK))
|
||||
(!last_word.empty() && StringUtils::isCJKUnicode(last_word.back()) && !isCJK))
|
||||
{
|
||||
// if current character is white space, put it into the current word
|
||||
if (isspace) last_word.push_back(character);
|
||||
|
|
@ -139,9 +135,9 @@ bool LabelTextFormatter::multilineText(Label *theLabel)
|
|||
{
|
||||
last_word.push_back(character);
|
||||
|
||||
int found = cc_utf8_find_last_not_char(multiline_string, ' ');
|
||||
int found = StringUtils::getIndexOfLastNotChar16(multiline_string, ' ');
|
||||
if (found != -1)
|
||||
cc_utf8_trim_ws(&multiline_string);
|
||||
StringUtils::trimUTF16Vector(multiline_string);
|
||||
else
|
||||
multiline_string.clear();
|
||||
|
||||
|
|
@ -153,7 +149,7 @@ bool LabelTextFormatter::multilineText(Label *theLabel)
|
|||
}
|
||||
else
|
||||
{
|
||||
cc_utf8_trim_ws(&last_word);
|
||||
StringUtils::trimUTF16Vector(last_word);
|
||||
|
||||
last_word.push_back('\n');
|
||||
|
||||
|
|
@ -175,16 +171,11 @@ bool LabelTextFormatter::multilineText(Label *theLabel)
|
|||
|
||||
multiline_string.insert(multiline_string.end(), last_word.begin(), last_word.end());
|
||||
|
||||
size_t size = multiline_string.size();
|
||||
unsigned short* strNew = new unsigned short[size + 1];
|
||||
std::u16string strNew(multiline_string.begin(), multiline_string.end());
|
||||
|
||||
for (size_t j = 0; j < size; ++j)
|
||||
{
|
||||
strNew[j] = multiline_string[j];
|
||||
}
|
||||
|
||||
strNew[size] = 0;
|
||||
theLabel->setCurrentString(strNew);
|
||||
theLabel->_currentUTF16String = strNew;
|
||||
theLabel->computeStringNumLines();
|
||||
theLabel->computeHorizontalKernings(theLabel->_currentUTF16String);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -194,8 +185,8 @@ bool LabelTextFormatter::alignText(Label *theLabel)
|
|||
int i = 0;
|
||||
|
||||
int lineNumber = 0;
|
||||
int strLen = cc_wcslen(theLabel->_currentUTF16String);
|
||||
vector<unsigned short> lastLine;
|
||||
int strLen = static_cast<int>(theLabel->_currentUTF16String.length());
|
||||
std::vector<char16_t> lastLine;
|
||||
auto strWhole = theLabel->_currentUTF16String;
|
||||
|
||||
if (theLabel->_labelWidth > theLabel->_contentSize.width)
|
||||
|
|
@ -205,7 +196,7 @@ bool LabelTextFormatter::alignText(Label *theLabel)
|
|||
|
||||
for (int ctr = 0; ctr <= strLen; ++ctr)
|
||||
{
|
||||
unsigned short currentChar = strWhole[ctr];
|
||||
char16_t currentChar = strWhole[ctr];
|
||||
|
||||
if (currentChar == '\n' || currentChar == 0)
|
||||
{
|
||||
|
|
@ -334,7 +325,7 @@ bool LabelTextFormatter::createStringSprites(Label *theLabel)
|
|||
|
||||
for (unsigned int i = 0; i < stringLen; i++)
|
||||
{
|
||||
unsigned short c = strWhole[i];
|
||||
char16_t c = strWhole[i];
|
||||
if (fontAtlas->getLetterDefinitionForChar(c, tempDefinition))
|
||||
{
|
||||
charXOffset = tempDefinition.offsetX;
|
||||
|
|
|
|||
|
|
@ -27,13 +27,15 @@ THE SOFTWARE.
|
|||
|
||||
#include <stdarg.h>
|
||||
#include "2d/CCLayer.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "2d/CCScriptSupport.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "math/TransformUtils.h"
|
||||
// extern
|
||||
#include "2d/platform/CCDevice.h"
|
||||
#include "2d/CCScene.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/CCCustomCommand.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "base/CCEventDispatcher.h"
|
||||
#include "base/CCEventListenerTouch.h"
|
||||
#include "base/CCEventTouch.h"
|
||||
|
|
@ -41,10 +43,8 @@ THE SOFTWARE.
|
|||
#include "base/CCEventListenerKeyboard.h"
|
||||
#include "base/CCEventAcceleration.h"
|
||||
#include "base/CCEventListenerAcceleration.h"
|
||||
#include "2d/platform/CCDevice.h"
|
||||
#include "2d/CCScene.h"
|
||||
#include "renderer/CCCustomCommand.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "math/TransformUtils.h"
|
||||
|
||||
#include "deprecated/CCString.h"
|
||||
|
||||
#if CC_USE_PHYSICS
|
||||
|
|
@ -534,7 +534,7 @@ bool LayerColor::initWithColor(const Color4B& color, GLfloat w, GLfloat h)
|
|||
updateColor();
|
||||
setContentSize(Size(w, h));
|
||||
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_COLOR_NO_MVP));
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_COLOR_NO_MVP));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -602,8 +602,8 @@ void LayerColor::draw(Renderer *renderer, const Matrix &transform, bool transfor
|
|||
|
||||
void LayerColor::onDraw(const Matrix& transform, bool transformUpdated)
|
||||
{
|
||||
getShaderProgram()->use();
|
||||
getShaderProgram()->setUniformsForBuiltins(transform);
|
||||
getGLProgram()->use();
|
||||
getGLProgram()->setUniformsForBuiltins(transform);
|
||||
|
||||
GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_COLOR );
|
||||
//
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ THE SOFTWARE.
|
|||
****************************************************************************/
|
||||
#include "2d/CCMotionStreak.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/CCVertex.h"
|
||||
#include "base/ccMacros.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/CCCustomCommand.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "base/ccMacros.h"
|
||||
#include "base/CCDirector.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
|
|
@ -127,8 +127,8 @@ bool MotionStreak::initWithFade(float fade, float minSeg, float stroke, const Co
|
|||
// Set blend mode
|
||||
_blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED;
|
||||
|
||||
// shader program
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
// shader state
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
|
||||
setTexture(texture);
|
||||
setColor(color);
|
||||
|
|
@ -375,8 +375,8 @@ void MotionStreak::reset()
|
|||
|
||||
void MotionStreak::onDraw(const Matrix &transform, bool transformUpdated)
|
||||
{
|
||||
getShaderProgram()->use();
|
||||
getShaderProgram()->setUniformsForBuiltins(transform);
|
||||
getGLProgram()->use();
|
||||
getGLProgram()->setUniformsForBuiltins(transform);
|
||||
|
||||
GL::enableVertexAttribs(GL::VERTEX_ATTRIB_FLAG_POS_COLOR_TEX );
|
||||
GL::blendFunc( _blendFunc.src, _blendFunc.dst );
|
||||
|
|
@ -389,13 +389,13 @@ void MotionStreak::onDraw(const Matrix &transform, bool transformUpdated)
|
|||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, 0);
|
||||
|
||||
setGLBufferData(_texCoords, (sizeof(Tex2F) * _maxPoints * 2), 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);
|
||||
|
||||
setGLBufferData(_colorPointer, (sizeof(GLubyte) * _maxPoints * 2 * 4), 2);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0);
|
||||
#else
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, _vertices);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, 0, _texCoords);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoords);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, _colorPointer);
|
||||
#endif // EMSCRIPTEN
|
||||
|
||||
|
|
|
|||
|
|
@ -30,30 +30,29 @@ THE SOFTWARE.
|
|||
|
||||
#include <algorithm>
|
||||
|
||||
#include "deprecated/CCString.h"
|
||||
#include "2d/ccCArray.h"
|
||||
#include "math/TransformUtils.h"
|
||||
#include "2d/CCGrid.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "base/CCScheduler.h"
|
||||
#include "base/CCTouch.h"
|
||||
#include "2d/CCActionManager.h"
|
||||
#include "2d/CCScriptSupport.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "base/CCEventDispatcher.h"
|
||||
#include "base/CCEvent.h"
|
||||
#include "base/CCEventTouch.h"
|
||||
#include "2d/ccCArray.h"
|
||||
#include "2d/CCGrid.h"
|
||||
#include "2d/CCActionManager.h"
|
||||
#include "2d/CCScriptSupport.h"
|
||||
#include "2d/CCScene.h"
|
||||
#include "2d/CCComponent.h"
|
||||
#include "2d/CCComponentContainer.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "math/TransformUtils.h"
|
||||
|
||||
#include "deprecated/CCString.h"
|
||||
|
||||
#if CC_USE_PHYSICS
|
||||
#include "physics/CCPhysicsBody.h"
|
||||
#endif
|
||||
|
||||
// externals
|
||||
#include "2d/CCComponent.h"
|
||||
#include "2d/CCComponentContainer.h"
|
||||
|
||||
|
||||
|
||||
#if CC_NODE_RENDER_SUBPIXEL
|
||||
#define RENDER_IN_SUBPIXEL
|
||||
|
|
@ -102,7 +101,7 @@ Node::Node(void)
|
|||
// userData is always inited as nil
|
||||
, _userData(nullptr)
|
||||
, _userObject(nullptr)
|
||||
, _shaderProgram(nullptr)
|
||||
, _glProgramState(nullptr)
|
||||
, _orderOfArrival(0)
|
||||
, _running(false)
|
||||
, _visible(true)
|
||||
|
|
@ -155,7 +154,7 @@ Node::~Node()
|
|||
CC_SAFE_RELEASE_NULL(_userObject);
|
||||
|
||||
// attributes
|
||||
CC_SAFE_RELEASE_NULL(_shaderProgram);
|
||||
CC_SAFE_RELEASE_NULL(_glProgramState);
|
||||
|
||||
for (auto& child : _children)
|
||||
{
|
||||
|
|
@ -629,11 +628,33 @@ void Node::setUserObject(Ref *pUserObject)
|
|||
_userObject = pUserObject;
|
||||
}
|
||||
|
||||
void Node::setShaderProgram(GLProgram *pShaderProgram)
|
||||
GLProgramState* Node::getGLProgramState()
|
||||
{
|
||||
CC_SAFE_RETAIN(pShaderProgram);
|
||||
CC_SAFE_RELEASE(_shaderProgram);
|
||||
_shaderProgram = pShaderProgram;
|
||||
return _glProgramState;
|
||||
}
|
||||
|
||||
void Node::setGLProgramState(cocos2d::GLProgramState *glProgramState)
|
||||
{
|
||||
if(glProgramState != _glProgramState) {
|
||||
CC_SAFE_RELEASE(_glProgramState);
|
||||
_glProgramState = glProgramState;
|
||||
CC_SAFE_RETAIN(_glProgramState);
|
||||
}
|
||||
}
|
||||
|
||||
void Node::setGLProgram(GLProgram *glProgram)
|
||||
{
|
||||
if (_glProgramState == nullptr || (_glProgramState && _glProgramState->getGLProgram() != glProgram))
|
||||
{
|
||||
CC_SAFE_RELEASE(_glProgramState);
|
||||
_glProgramState = GLProgramState::getOrCreate(glProgram);
|
||||
_glProgramState->retain();
|
||||
}
|
||||
}
|
||||
|
||||
GLProgram * Node::getGLProgram()
|
||||
{
|
||||
return _glProgramState ? _glProgramState->getGLProgram() : nullptr;
|
||||
}
|
||||
|
||||
Scene* Node::getScene()
|
||||
|
|
|
|||
|
|
@ -30,15 +30,14 @@
|
|||
#define __CCNODE_H__
|
||||
|
||||
#include "base/ccMacros.h"
|
||||
#include "math/CCAffineTransform.h"
|
||||
#include "CCGL.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/CCScriptSupport.h"
|
||||
#include "2d/CCProtocols.h"
|
||||
#include "base/CCEventDispatcher.h"
|
||||
#include "base/CCVector.h"
|
||||
#include "math/CCAffineTransform.h"
|
||||
#include "math/CCMath.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "2d/CCScriptSupport.h"
|
||||
#include "2d/CCProtocols.h"
|
||||
#include "CCGL.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
|
|
@ -53,6 +52,8 @@ class ComponentContainer;
|
|||
class EventDispatcher;
|
||||
class Scene;
|
||||
class Renderer;
|
||||
class GLProgram;
|
||||
class GLProgramState;
|
||||
#if CC_USE_PHYSICS
|
||||
class PhysicsBody;
|
||||
#endif
|
||||
|
|
@ -821,14 +822,17 @@ public:
|
|||
|
||||
|
||||
/// @{
|
||||
/// @name Shader Program
|
||||
/// @name GLProgram
|
||||
/**
|
||||
* Return the shader program currently used for this node
|
||||
* Return the GLProgram (shader) currently used for this node
|
||||
*
|
||||
* @return The shader program currently used for this node
|
||||
* @return The GLProgram (shader) currently used for this node
|
||||
*/
|
||||
virtual GLProgram* getShaderProgram() { return _shaderProgram; }
|
||||
virtual const GLProgram* getShaderProgram() const { return _shaderProgram; }
|
||||
GLProgram* getGLProgram();
|
||||
CC_DEPRECATED_ATTRIBUTE GLProgram* getShaderProgram() { return getGLProgram(); }
|
||||
|
||||
GLProgramState *getGLProgramState();
|
||||
void setGLProgramState(GLProgramState *glProgramState);
|
||||
|
||||
/**
|
||||
* Sets the shader program for this node
|
||||
|
|
@ -836,12 +840,13 @@ public:
|
|||
* Since v2.0, each rendering node must set its shader program.
|
||||
* It should be set in initialize phase.
|
||||
@code
|
||||
node->setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
node->setGLrProgram(GLProgramCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
@endcode
|
||||
*
|
||||
* @param shaderProgram The shader program
|
||||
*/
|
||||
virtual void setShaderProgram(GLProgram *shaderProgram);
|
||||
void setGLProgram(GLProgram *glprogram);
|
||||
CC_DEPRECATED_ATTRIBUTE void setShaderProgram(GLProgram *glprogram) { setGLProgram(glprogram); }
|
||||
/// @} end of Shader Program
|
||||
|
||||
|
||||
|
|
@ -1417,7 +1422,7 @@ protected:
|
|||
void *_userData; ///< A user assingned void pointer, Can be point to any cpp object
|
||||
Ref *_userObject; ///< A user assigned Object
|
||||
|
||||
GLProgram *_shaderProgram; ///< OpenGL shader
|
||||
GLProgramState *_glProgramState; ///< OpenGL Program State
|
||||
|
||||
int _orderOfArrival; ///< used to preserve sequence while sorting children with the same localZOrder
|
||||
|
||||
|
|
|
|||
|
|
@ -28,23 +28,25 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "CCParticleBatchNode.h"
|
||||
#include "2d/CCParticleBatchNode.h"
|
||||
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCTextureAtlas.h"
|
||||
#include "base/ccConfig.h"
|
||||
#include "base/ccMacros.h"
|
||||
#include "2d/CCGrid.h"
|
||||
#include "CCParticleSystem.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "base/base64.h"
|
||||
#include "base/ZipUtils.h"
|
||||
#include "2d/CCParticleSystem.h"
|
||||
#include "2d/platform/CCFileUtils.h"
|
||||
#include "base/CCProfiling.h"
|
||||
#include "base/ccConfig.h"
|
||||
#include "base/ccMacros.h"
|
||||
#include "base/base64.h"
|
||||
#include "base/ZipUtils.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/CCQuadCommand.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
ParticleBatchNode::ParticleBatchNode()
|
||||
|
|
@ -101,7 +103,7 @@ bool ParticleBatchNode::initWithTexture(Texture2D *tex, int capacity)
|
|||
|
||||
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
|
||||
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -392,7 +394,7 @@ void ParticleBatchNode::draw(Renderer *renderer, const Matrix &transform, bool t
|
|||
|
||||
_batchCommand.init(
|
||||
_globalZOrder,
|
||||
_shaderProgram,
|
||||
getGLProgram(),
|
||||
_blendFunc,
|
||||
_textureAtlas,
|
||||
_modelViewTransform);
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ ParticleSystem::ParticleSystem()
|
|||
, _texture(nullptr)
|
||||
, _blendFunc(BlendFunc::ALPHA_PREMULTIPLIED)
|
||||
, _opacityModifyRGB(false)
|
||||
, _yCoordFlipped(0)
|
||||
, _yCoordFlipped(1)
|
||||
, _positionType(PositionType::FREE)
|
||||
{
|
||||
modeA.gravity = Vector2::ZERO;
|
||||
|
|
@ -416,10 +416,7 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
|
|||
}
|
||||
}
|
||||
|
||||
if (!_configName.empty())
|
||||
{
|
||||
_yCoordFlipped = dictionary["yCoordFlipped"].asInt();
|
||||
}
|
||||
_yCoordFlipped = dictionary.find("yCoordFlipped") == dictionary.end() ? 1 : dictionary.at("yCoordFlipped").asInt();
|
||||
|
||||
if( !this->_texture)
|
||||
CCLOGWARN("cocos2d: Warning: ParticleSystemQuad system without a texture");
|
||||
|
|
@ -726,14 +723,12 @@ void ParticleSystem::update(float dt)
|
|||
tmp = radial + tangential + modeA.gravity;
|
||||
tmp = tmp * dt;
|
||||
p->modeA.dir = p->modeA.dir + tmp;
|
||||
if (_configName.length()>0 && _yCoordFlipped == -1)
|
||||
{
|
||||
tmp = p->modeA.dir * -dt;
|
||||
}
|
||||
else
|
||||
{
|
||||
tmp = p->modeA.dir * dt;
|
||||
}
|
||||
|
||||
// this is cocos2d-x v3.0
|
||||
// if (_configName.length()>0 && _yCoordFlipped != -1)
|
||||
|
||||
// this is cocos2d-x v3.0
|
||||
tmp = p->modeA.dir * dt * _yCoordFlipped;
|
||||
p->pos = p->pos + tmp;
|
||||
}
|
||||
|
||||
|
|
@ -746,10 +741,7 @@ void ParticleSystem::update(float dt)
|
|||
|
||||
p->pos.x = - cosf(p->modeB.angle) * p->modeB.radius;
|
||||
p->pos.y = - sinf(p->modeB.angle) * p->modeB.radius;
|
||||
if (_yCoordFlipped == 1)
|
||||
{
|
||||
p->pos.y = -p->pos.y;
|
||||
}
|
||||
p->pos.y *= _yCoordFlipped;
|
||||
}
|
||||
|
||||
// color
|
||||
|
|
|
|||
|
|
@ -29,15 +29,15 @@ THE SOFTWARE.
|
|||
#include "CCGL.h"
|
||||
#include "2d/CCParticleSystemQuad.h"
|
||||
#include "2d/CCSpriteFrame.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "CCParticleBatchNode.h"
|
||||
#include "2d/CCParticleBatchNode.h"
|
||||
#include "2d/CCTextureAtlas.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "math/TransformUtils.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "base/CCEventType.h"
|
||||
#include "base/CCConfiguration.h"
|
||||
#include "math/TransformUtils.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "renderer/CCQuadCommand.h"
|
||||
#include "renderer/CCCustomCommand.h"
|
||||
|
|
@ -131,7 +131,7 @@ bool ParticleSystemQuad::initWithTotalParticles(int numberOfParticles)
|
|||
setupVBO();
|
||||
}
|
||||
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
|
||||
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
// Need to listen the event only when not use batchnode, because it will use VBO
|
||||
|
|
@ -374,7 +374,7 @@ void ParticleSystemQuad::draw(Renderer *renderer, const Matrix &transform, bool
|
|||
//quad command
|
||||
if(_particleIdx > 0)
|
||||
{
|
||||
_quadCommand.init(_globalZOrder, _texture->getName(), _shaderProgram, _blendFunc, _quads, _particleIdx, transform);
|
||||
_quadCommand.init(_globalZOrder, _texture->getName(), getGLProgramState(), _blendFunc, _quads, _particleIdx, transform);
|
||||
renderer->addCommand(&_quadCommand);
|
||||
}
|
||||
}
|
||||
|
|
@ -478,8 +478,8 @@ void ParticleSystemQuad::setupVBOandVAO()
|
|||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, kQuadSize, (GLvoid*) offsetof( V3F_C4B_T2F, colors));
|
||||
|
||||
// tex coords
|
||||
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, kQuadSize, (GLvoid*) offsetof( V3F_C4B_T2F, texCoords));
|
||||
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORD);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, kQuadSize, (GLvoid*) offsetof( V3F_C4B_T2F, texCoords));
|
||||
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]);
|
||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(_indices[0]) * _totalParticles * 6, _indices, GL_STATIC_DRAW);
|
||||
|
|
|
|||
|
|
@ -26,15 +26,15 @@ THE SOFTWARE.
|
|||
#include "2d/CCProgressTimer.h"
|
||||
|
||||
#include "base/ccMacros.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "math/TransformUtils.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCDrawingPrimitives.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "renderer/CCCustomCommand.h"
|
||||
#include "math/TransformUtils.h"
|
||||
|
||||
// extern
|
||||
#include <float.h>
|
||||
|
|
@ -85,8 +85,9 @@ bool ProgressTimer::initWithSprite(Sprite* sp)
|
|||
setMidpoint(Vector2(0.5f, 0.5f));
|
||||
setBarChangeRate(Vector2(1,1));
|
||||
setSprite(sp);
|
||||
// shader program
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
|
||||
// shader state
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -502,8 +503,8 @@ Vector2 ProgressTimer::boundaryTexCoord(char index)
|
|||
void ProgressTimer::onDraw(const Matrix &transform, bool transformUpdated)
|
||||
{
|
||||
|
||||
getShaderProgram()->use();
|
||||
getShaderProgram()->setUniformsForBuiltins(transform);
|
||||
getGLProgram()->use();
|
||||
getGLProgram()->setUniformsForBuiltins(transform);
|
||||
|
||||
GL::blendFunc( _sprite->getBlendFunc().src, _sprite->getBlendFunc().dst );
|
||||
|
||||
|
|
@ -521,10 +522,10 @@ void ProgressTimer::onDraw(const Matrix &transform, bool transformUpdated)
|
|||
glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V2F_C4B_T2F), (GLvoid*)offset);
|
||||
|
||||
offset += sizeof(Color4B);
|
||||
glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid*)offset);
|
||||
glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid*)offset);
|
||||
#else
|
||||
glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]) , &_vertexData[0].vertices);
|
||||
glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]), &_vertexData[0].texCoords);
|
||||
glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]), &_vertexData[0].texCoords);
|
||||
glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(_vertexData[0]), &_vertexData[0].colors);
|
||||
#endif // EMSCRIPTEN
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ THE SOFTWARE.
|
|||
#include "2d/CCRenderTexture.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "2d/platform/CCImage.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "base/CCConfiguration.h"
|
||||
#include "2d/ccUtils.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
|
|
|
|||
|
|
@ -33,10 +33,11 @@ THE SOFTWARE.
|
|||
#include "2d/CCSpriteFrameCache.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCDrawingPrimitives.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/CCTexture2D.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "base/CCProfiling.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "base/CCDirector.h"
|
||||
|
|
@ -44,7 +45,6 @@ THE SOFTWARE.
|
|||
#include "math/CCGeometry.h"
|
||||
#include "math/CCAffineTransform.h"
|
||||
#include "math/TransformUtils.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
|
||||
#include "deprecated/CCString.h"
|
||||
|
||||
|
|
@ -248,8 +248,8 @@ bool Sprite::initWithTexture(Texture2D *texture, const Rect& rect, bool rotated)
|
|||
_quad.tl.colors = Color4B::WHITE;
|
||||
_quad.tr.colors = Color4B::WHITE;
|
||||
|
||||
// shader program
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
|
||||
// shader state
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
|
||||
|
||||
// update texture (calls updateBlendFunc)
|
||||
setTexture(texture);
|
||||
|
|
@ -590,7 +590,7 @@ void Sprite::draw(Renderer *renderer, const Matrix &transform, bool transformUpd
|
|||
|
||||
if(_insideBounds)
|
||||
{
|
||||
_quadCommand.init(_globalZOrder, _texture->getName(), _shaderProgram, _blendFunc, &_quad, 1, transform);
|
||||
_quadCommand.init(_globalZOrder, _texture->getName(), getGLProgramState(), _blendFunc, &_quad, 1, transform);
|
||||
renderer->addCommand(&_quadCommand);
|
||||
#if CC_SPRITE_DEBUG_DRAW
|
||||
_customDebugDrawCommand.init(_globalZOrder);
|
||||
|
|
|
|||
|
|
@ -27,25 +27,26 @@ THE SOFTWARE.
|
|||
****************************************************************************/
|
||||
|
||||
#include "2d/CCSpriteBatchNode.h"
|
||||
#include "base/ccConfig.h"
|
||||
|
||||
#include "2d/CCSprite.h"
|
||||
#include "2d/CCGrid.h"
|
||||
#include "2d/CCDrawingPrimitives.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "math/TransformUtils.h"
|
||||
#include "base/CCProfiling.h"
|
||||
#include "2d/CCLayer.h"
|
||||
#include "2d/CCScene.h"
|
||||
#include "base/ccConfig.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "base/CCProfiling.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "renderer/CCQuadCommand.h"
|
||||
// external
|
||||
#include "math/TransformUtils.h"
|
||||
|
||||
#include "deprecated/CCString.h" // For StringUtils::format
|
||||
|
||||
// external
|
||||
#include <algorithm>
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
|
@ -99,7 +100,7 @@ bool SpriteBatchNode::initWithTexture(Texture2D *tex, ssize_t capacity)
|
|||
|
||||
_descendants.reserve(capacity);
|
||||
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -368,7 +369,7 @@ void SpriteBatchNode::draw(Renderer *renderer, const Matrix &transform, bool tra
|
|||
|
||||
_batchCommand.init(
|
||||
_globalZOrder,
|
||||
_shaderProgram,
|
||||
getGLProgram(),
|
||||
_blendFunc,
|
||||
_textureAtlas,
|
||||
transform);
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ 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 "CCTMXLayer.h"
|
||||
#include "CCTMXXMLParser.h"
|
||||
#include "CCTMXTiledMap.h"
|
||||
#include "2d/CCTMXLayer.h"
|
||||
#include "2d/CCTMXXMLParser.h"
|
||||
#include "2d/CCTMXTiledMap.h"
|
||||
#include "2d/CCSprite.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccCArray.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "base/CCDirector.h"
|
||||
|
||||
#include "deprecated/CCString.h" // For StringUtils::format
|
||||
|
|
@ -205,15 +205,15 @@ void TMXLayer::parseInternalProperties()
|
|||
_useAutomaticVertexZ = true;
|
||||
auto alphaFuncVal = getProperty("cc_alpha_func");
|
||||
float alphaFuncValue = alphaFuncVal.asFloat();
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST));
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST));
|
||||
|
||||
GLint alphaValueLocation = glGetUniformLocation(getShaderProgram()->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
|
||||
GLint alphaValueLocation = glGetUniformLocation(getGLProgram()->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
|
||||
|
||||
// NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison
|
||||
|
||||
// use shader program to set uniform
|
||||
getShaderProgram()->use();
|
||||
getShaderProgram()->setUniformLocationWith1f(alphaValueLocation, alphaFuncValue);
|
||||
getGLProgram()->use();
|
||||
getGLProgram()->setUniformLocationWith1f(alphaValueLocation, alphaFuncValue);
|
||||
CHECK_GL_ERROR_DEBUG();
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -31,21 +31,23 @@ THE SOFTWARE.
|
|||
* https://devforums.apple.com/message/37855#37855 by a1studmuffin
|
||||
*/
|
||||
|
||||
#include "CCGL.h"
|
||||
#include "2d/CCTexture2D.h"
|
||||
#include "2d/platform/CCImage.h"
|
||||
#include "2d/ccUtils.h"
|
||||
#include "2d/platform/CCDevice.h"
|
||||
#include "base/ccConfig.h"
|
||||
#include "base/ccMacros.h"
|
||||
#include "base/CCConfiguration.h"
|
||||
#include "2d/platform/CCImage.h"
|
||||
#include "CCGL.h"
|
||||
#include "2d/ccUtils.h"
|
||||
#include "base/CCPlatformMacros.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/platform/CCDevice.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/CCGLProgramCache.h"
|
||||
|
||||
#include "deprecated/CCString.h"
|
||||
|
||||
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
#include "2d/CCTextureCache.h"
|
||||
#endif
|
||||
|
|
@ -506,30 +508,18 @@ void Texture2D::setMaxT(GLfloat maxT)
|
|||
_maxT = maxT;
|
||||
}
|
||||
|
||||
GLProgram* Texture2D::getShaderProgram() const
|
||||
GLProgram* Texture2D::getGLProgram() const
|
||||
{
|
||||
return _shaderProgram;
|
||||
}
|
||||
|
||||
void Texture2D::setShaderProgram(GLProgram* shaderProgram)
|
||||
void Texture2D::setGLProgram(GLProgram* shaderProgram)
|
||||
{
|
||||
CC_SAFE_RETAIN(shaderProgram);
|
||||
CC_SAFE_RELEASE(_shaderProgram);
|
||||
_shaderProgram = shaderProgram;
|
||||
}
|
||||
|
||||
void Texture2D::releaseData(void *data)
|
||||
{
|
||||
free(data);
|
||||
}
|
||||
|
||||
void* Texture2D::keepData(void *data, unsigned int length)
|
||||
{
|
||||
CC_UNUSED_PARAM(length);
|
||||
//The texture data mustn't be saved because it isn't a mutable texture.
|
||||
return data;
|
||||
}
|
||||
|
||||
bool Texture2D::hasPremultipliedAlpha() const
|
||||
{
|
||||
return _hasPremultipliedAlpha;
|
||||
|
|
@ -692,8 +682,8 @@ bool Texture2D::initWithMipmaps(MipmapInfo* mipmaps, int mipmapsNum, PixelFormat
|
|||
_hasPremultipliedAlpha = false;
|
||||
_hasMipmaps = mipmapsNum > 1;
|
||||
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE));
|
||||
|
||||
// shader
|
||||
setGLProgram(GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -1169,7 +1159,7 @@ void Texture2D::drawAtPoint(const Vector2& point)
|
|||
point.x, height + point.y,
|
||||
width + point.x, height + point.y };
|
||||
|
||||
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();
|
||||
|
||||
|
|
@ -1181,10 +1171,10 @@ void Texture2D::drawAtPoint(const Vector2& point)
|
|||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, 0);
|
||||
|
||||
setGLBufferData(coordinates, 8 * sizeof(GLfloat), 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);
|
||||
#else
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, 0, coordinates);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, coordinates);
|
||||
#endif // EMSCRIPTEN
|
||||
|
||||
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
||||
|
|
@ -1203,7 +1193,7 @@ void Texture2D::drawInRect(const Rect& rect)
|
|||
rect.origin.x, rect.origin.y + rect.size.height, /*0.0f,*/
|
||||
rect.origin.x + rect.size.width, rect.origin.y + rect.size.height, /*0.0f*/ };
|
||||
|
||||
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();
|
||||
|
||||
|
|
@ -1214,10 +1204,10 @@ void Texture2D::drawInRect(const Rect& rect)
|
|||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, 0);
|
||||
|
||||
setGLBufferData(coordinates, 8 * sizeof(GLfloat), 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);
|
||||
#else
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, 0, coordinates);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, coordinates);
|
||||
#endif // EMSCRIPTEN
|
||||
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,17 +203,6 @@ public:
|
|||
*/
|
||||
virtual std::string getDescription() const;
|
||||
|
||||
/** These functions are needed to create mutable textures
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void releaseData(void *data);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void* keepData(void *data, unsigned int length);
|
||||
|
||||
/** Initializes with a texture2d with data
|
||||
* @js NA
|
||||
* @lua NA
|
||||
|
|
@ -350,8 +339,8 @@ public:
|
|||
|
||||
Size getContentSize() const;
|
||||
|
||||
void setShaderProgram(GLProgram* program);
|
||||
GLProgram* getShaderProgram() const;
|
||||
void setGLProgram(GLProgram* program);
|
||||
GLProgram* getGLProgram() const;
|
||||
|
||||
public:
|
||||
static const PixelFormatInfoMap& getPixelFormatInfoMap();
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ THE SOFTWARE.
|
|||
#include "2d/CCTextureAtlas.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "base/ccMacros.h"
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "base/CCEventType.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "CCGL.h"
|
||||
|
|
@ -274,8 +274,8 @@ void TextureAtlas::setupVBOandVAO()
|
|||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, kQuadSize, (GLvoid*) offsetof( V3F_C4B_T2F, colors));
|
||||
|
||||
// tex coords
|
||||
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORDS);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, kQuadSize, (GLvoid*) offsetof( V3F_C4B_T2F, texCoords));
|
||||
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORD);
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, kQuadSize, (GLvoid*) offsetof( V3F_C4B_T2F, texCoords));
|
||||
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]);
|
||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(_indices[0]) * _capacity * 6, _indices, GL_STATIC_DRAW);
|
||||
|
|
@ -673,7 +673,7 @@ void TextureAtlas::drawNumberOfQuads(ssize_t numberOfQuads, ssize_t start)
|
|||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, kQuadSize, (GLvoid*) offsetof(V3F_C4B_T2F, colors));
|
||||
|
||||
// tex coords
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORDS, 2, GL_FLOAT, GL_FALSE, kQuadSize, (GLvoid*) offsetof(V3F_C4B_T2F, texCoords));
|
||||
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, kQuadSize, (GLvoid*) offsetof(V3F_C4B_T2F, texCoords));
|
||||
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,14 +26,19 @@ set(COCOS_2D_PLATFORM_SRC
|
|||
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
../external/ConvertUTF
|
||||
)
|
||||
|
||||
|
||||
set(COCOS_2D_SRC
|
||||
2d/ccFPSImages.c
|
||||
2d/CCAction.cpp
|
||||
2d/CCActionCamera.cpp
|
||||
2d/CCActionCatmullRom.cpp
|
||||
2d/CCAction.cpp
|
||||
2d/CCActionEase.cpp
|
||||
2d/CCActionGrid3D.cpp
|
||||
2d/CCActionGrid.cpp
|
||||
2d/CCActionGrid3D.cpp
|
||||
2d/CCActionInstant.cpp
|
||||
2d/CCActionInterval.cpp
|
||||
2d/CCActionManager.cpp
|
||||
|
|
@ -41,32 +46,29 @@ set(COCOS_2D_SRC
|
|||
2d/CCActionProgressTimer.cpp
|
||||
2d/CCActionTiledGrid.cpp
|
||||
2d/CCActionTween.cpp
|
||||
2d/CCAnimationCache.cpp
|
||||
2d/CCAnimation.cpp
|
||||
2d/CCAnimationCache.cpp
|
||||
2d/CCAtlasNode.cpp
|
||||
2d/ccCArray.cpp
|
||||
2d/CCClippingNode.cpp
|
||||
2d/CCComponentContainer.cpp
|
||||
2d/CCComponent.cpp
|
||||
2d/CCDrawingPrimitives.cpp
|
||||
2d/CCComponentContainer.cpp
|
||||
2d/CCDrawNode.cpp
|
||||
2d/CCFontAtlasCache.cpp
|
||||
2d/CCFontAtlas.cpp
|
||||
2d/CCFontCharMap.cpp
|
||||
2d/CCDrawingPrimitives.cpp
|
||||
2d/CCFont.cpp
|
||||
2d/CCFontAtlas.cpp
|
||||
2d/CCFontAtlasCache.cpp
|
||||
2d/CCFontCharMap.cpp
|
||||
2d/CCFontFNT.cpp
|
||||
2d/CCFontFreeType.cpp
|
||||
2d/CCGLBufferedNode.cpp
|
||||
2d/CCGLProgram.cpp
|
||||
2d/ccGLStateCache.cpp
|
||||
2d/CCGrabber.cpp
|
||||
2d/CCGrid.cpp
|
||||
2d/CCIMEDispatcher.cpp
|
||||
2d/CCLabel.cpp
|
||||
2d/CCLabelAtlas.cpp
|
||||
2d/CCLabelBMFont.cpp
|
||||
2d/CCLabel.cpp
|
||||
2d/CCLabelTextFormatter.cpp
|
||||
2d/CCLabelTTF.cpp
|
||||
2d/CCLabelTextFormatter.cpp
|
||||
2d/CCLayer.cpp
|
||||
2d/CCMenu.cpp
|
||||
2d/CCMenuItem.cpp
|
||||
|
|
@ -82,37 +84,37 @@ set(COCOS_2D_SRC
|
|||
2d/CCRenderTexture.cpp
|
||||
2d/CCScene.cpp
|
||||
2d/CCScriptSupport.cpp
|
||||
2d/CCShaderCache.cpp
|
||||
2d/ccShaders.cpp
|
||||
2d/CCSpriteBatchNode.cpp
|
||||
2d/CCSprite.cpp
|
||||
2d/CCSpriteFrameCache.cpp
|
||||
2d/CCSpriteBatchNode.cpp
|
||||
2d/CCSpriteFrame.cpp
|
||||
2d/CCSpriteFrameCache.cpp
|
||||
2d/CCTMXLayer.cpp
|
||||
2d/CCTMXObjectGroup.cpp
|
||||
2d/CCTMXTiledMap.cpp
|
||||
2d/CCTMXXMLParser.cpp
|
||||
2d/CCTextFieldTTF.cpp
|
||||
2d/CCTexture2D.cpp
|
||||
2d/CCTextureAtlas.cpp
|
||||
2d/CCTextureCache.cpp
|
||||
2d/CCTileMapAtlas.cpp
|
||||
2d/CCTMXLayer.cpp
|
||||
2d/CCTMXObjectGroup.cpp
|
||||
2d/CCTMXTiledMap.cpp
|
||||
2d/CCTMXXMLParser.cpp
|
||||
2d/CCTransition.cpp
|
||||
2d/CCTransitionPageTurn.cpp
|
||||
2d/CCTransitionProgress.cpp
|
||||
2d/CCTweenFunction.cpp
|
||||
2d/CCUserDefaultAndroid.cpp
|
||||
2d/CCUserDefault.cpp
|
||||
2d/ccUTF8.cpp
|
||||
2d/ccUtils.cpp
|
||||
2d/CCUserDefaultAndroid.cpp
|
||||
2d/CCVertex.cpp
|
||||
2d/TGAlib.cpp
|
||||
2d/ccCArray.cpp
|
||||
2d/ccUTF8.cpp
|
||||
2d/ccUtils.cpp
|
||||
2d/platform/CCSAXParser.cpp
|
||||
2d/platform/CCThread.cpp
|
||||
2d/platform/CCGLViewProtocol.cpp
|
||||
2d/platform/CCFileUtils.cpp
|
||||
2d/platform/CCImage.cpp
|
||||
2d/ccFPSImages.c
|
||||
../external/edtaa3func/edtaa3func.cpp
|
||||
../external/ConvertUTF/ConvertUTFWrapper.cpp
|
||||
../external/ConvertUTF/ConvertUTF.c
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
" \n\
|
||||
#ifdef GL_ES \n\
|
||||
precision lowp float; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
uniform sampler2D CC_Texture0; \n\
|
||||
uniform vec4 v_textColor; \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
vec4 color = texture2D(CC_Texture0, v_texCoord); \n\
|
||||
//the texture use dual channel 16-bit output for distance_map \n\
|
||||
//float dist = color.b+color.g/256.0; \n\
|
||||
// the texture use single channel 8-bit output for distance_map \n\
|
||||
float dist = color.a; \n\
|
||||
//todo:Implementation 'fwidth' for glsl 1.0 \n\
|
||||
//float width = fwidth(dist); \n\
|
||||
//assign width for constant will lead to a little bit fuzzy,it's temporary measure.\n\
|
||||
float width = 0.04; \n\
|
||||
float alpha = smoothstep(0.5-width, 0.5+width, dist) * v_textColor.a; \n\
|
||||
gl_FragColor = v_fragmentColor * vec4(v_textColor.rgb,alpha); \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
" \n\
|
||||
#ifdef GL_ES \n\
|
||||
precision lowp float; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
uniform sampler2D CC_Texture0; \n\
|
||||
uniform vec4 v_effectColor; \n\
|
||||
uniform vec4 v_textColor; \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
float dist = texture2D(CC_Texture0, v_texCoord).a; \n\
|
||||
//todo:Implementation 'fwidth' for glsl 1.0 \n\
|
||||
//float width = fwidth(dist); \n\
|
||||
//assign width for constant will lead to a little bit fuzzy,it's temporary measure.\n\
|
||||
float width = 0.04; \n\
|
||||
float alpha = smoothstep(0.5-width, 0.5+width, dist); \n\
|
||||
//glow \n\
|
||||
float mu = smoothstep(0.5, 1.0, sqrt(dist)); \n\
|
||||
vec4 color = v_effectColor*(1.0-alpha) + v_textColor*alpha; \n\
|
||||
gl_FragColor = v_fragmentColor * vec4(color.rgb, max(alpha,mu)*color.a); \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
#ifdef GL_ES \n\
|
||||
precision lowp float; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
uniform sampler2D CC_Texture0; \n\
|
||||
uniform vec4 v_textColor; \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_FragColor = v_fragmentColor * vec4( v_textColor.rgb, // RGB from uniform \n\
|
||||
v_textColor.a * texture2D(CC_Texture0, v_texCoord).a // A from texture & uniform \n\
|
||||
); \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
" \n\
|
||||
#ifdef GL_ES \n\
|
||||
precision lowp float; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
uniform sampler2D CC_Texture0; \n\
|
||||
uniform vec4 v_effectColor; \n\
|
||||
uniform vec4 v_textColor; \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
vec4 sample = texture2D(CC_Texture0, v_texCoord); \n\
|
||||
float fontAlpha = sample.a; \n\
|
||||
float outlineAlpha = sample.r; \n\
|
||||
if (outlineAlpha > 0.0){ \n\
|
||||
vec4 color = v_textColor * fontAlpha + v_effectColor * (1.0 - fontAlpha);\n\
|
||||
gl_FragColor = v_fragmentColor * vec4( color.rgb,max(fontAlpha,outlineAlpha)*color.a); \n\
|
||||
} \n\
|
||||
else { \n\
|
||||
discard; \n\
|
||||
} \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
attribute vec4 a_position; \n\
|
||||
attribute vec2 a_texCoord; \n\
|
||||
attribute vec4 a_color; \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
varying lowp vec4 v_fragmentColor; \n\
|
||||
varying mediump vec2 v_texCoord; \n\
|
||||
#else \n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_Position = CC_MVPMatrix * a_position; \n\
|
||||
v_fragmentColor = a_color; \n\
|
||||
v_texCoord = a_texCoord; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
#ifdef GL_ES \n\
|
||||
// #extension GL_OES_standard_derivatives : enable \n\
|
||||
\n\
|
||||
varying mediump vec4 v_color; \n\
|
||||
varying mediump vec2 v_texcoord; \n\
|
||||
#else \n\
|
||||
varying vec4 v_color; \n\
|
||||
varying vec2 v_texcoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
// #if defined GL_OES_standard_derivatives \n\
|
||||
// gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord)); \n\
|
||||
// #else \n\
|
||||
gl_FragColor = v_color*step(0.0, 1.0 - length(v_texcoord)); \n\
|
||||
// #endif \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
#ifdef GL_ES \n\
|
||||
attribute mediump vec4 a_position; \n\
|
||||
attribute mediump vec2 a_texcoord; \n\
|
||||
attribute mediump vec4 a_color; \n\
|
||||
\n\
|
||||
varying mediump vec4 v_color; \n\
|
||||
varying mediump vec2 v_texcoord; \n\
|
||||
\n\
|
||||
#else \n\
|
||||
attribute vec4 a_position; \n\
|
||||
attribute vec2 a_texcoord; \n\
|
||||
attribute vec4 a_color; \n\
|
||||
\n\
|
||||
varying vec4 v_color; \n\
|
||||
varying vec2 v_texcoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
v_color = vec4(a_color.rgb * a_color.a, a_color.a); \n\
|
||||
v_texcoord = a_texcoord; \n\
|
||||
\n\
|
||||
gl_Position = CC_MVPMatrix * a_position; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
attribute vec4 a_position; \n\
|
||||
attribute vec2 a_texCoord; \n\
|
||||
attribute vec4 a_color; \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
varying lowp vec4 v_fragmentColor; \n\
|
||||
varying mediump vec2 v_texCoord; \n\
|
||||
#else \n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_Position = CC_MVPMatrix * a_position; \n\
|
||||
v_fragmentColor = a_color; \n\
|
||||
v_texCoord = a_texCoord; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Brian Chapados
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
#ifdef GL_ES \n\
|
||||
precision lowp float; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
uniform sampler2D CC_Texture0; \n\
|
||||
uniform float CC_alpha_value; \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
vec4 texColor = texture2D(CC_Texture0, v_texCoord); \n\
|
||||
\n\
|
||||
// mimic: glAlphaFunc(GL_GREATER) \n\
|
||||
// pass if ( incoming_pixel >= CC_alpha_value ) => fail if incoming_pixel < CC_alpha_value \n\
|
||||
\n\
|
||||
if ( texColor.a <= CC_alpha_value ) \n\
|
||||
discard; \n\
|
||||
\n\
|
||||
gl_FragColor = texColor * v_fragmentColor; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
attribute vec4 a_position; \n\
|
||||
attribute vec2 a_texCoord; \n\
|
||||
attribute vec4 a_color; \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
varying lowp vec4 v_fragmentColor; \n\
|
||||
varying mediump vec2 v_texCoord; \n\
|
||||
#else \n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_Position = CC_PMatrix * a_position; \n\
|
||||
v_fragmentColor = a_color; \n\
|
||||
v_texCoord = a_texCoord; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
attribute vec4 a_position; \n\
|
||||
attribute vec2 a_texCoord; \n\
|
||||
attribute vec4 a_color; \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
varying lowp vec4 v_fragmentColor; \n\
|
||||
varying mediump vec2 v_texCoord; \n\
|
||||
#else \n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_Position = CC_MVPMatrix * a_position; \n\
|
||||
v_fragmentColor = a_color; \n\
|
||||
v_texCoord = a_texCoord; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
attribute vec4 a_position; \n\
|
||||
attribute vec2 a_texCoord; \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
varying mediump vec2 v_texCoord; \n\
|
||||
#else \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_Position = CC_MVPMatrix * a_position; \n\
|
||||
v_texCoord = a_texCoord; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
attribute vec4 a_position; \n\
|
||||
attribute vec2 a_texCoord; \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
varying mediump vec2 v_texCoord; \n\
|
||||
#else \n\
|
||||
varying vec2 v_texCoord; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_Position = CC_MVPMatrix * a_position; \n\
|
||||
v_texCoord = a_texCoord; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/*
|
||||
* cocos2d for iPhone: http://www.cocos2d-iphone.org
|
||||
*
|
||||
* Copyright (c) 2011 Ricardo Quesada
|
||||
* Copyright (c) 2012 Zynga Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
" \n\
|
||||
attribute vec4 a_position; \n\
|
||||
uniform vec4 u_color; \n\
|
||||
uniform float u_pointSize; \n\
|
||||
\n\
|
||||
#ifdef GL_ES \n\
|
||||
varying lowp vec4 v_fragmentColor; \n\
|
||||
#else \n\
|
||||
varying vec4 v_fragmentColor; \n\
|
||||
#endif \n\
|
||||
\n\
|
||||
void main() \n\
|
||||
{ \n\
|
||||
gl_Position = CC_MVPMatrix * a_position; \n\
|
||||
gl_PointSize = u_pointSize; \n\
|
||||
v_fragmentColor = u_color; \n\
|
||||
} \n\
|
||||
";
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2011 Zynga Inc.
|
||||
Copyright (c) 2012 cocos2d-x.org
|
||||
Copyright (c) 2013-2014 Chukong Technologies Inc.
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "2d/ccShaders.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
//
|
||||
const GLchar * ccPosition_uColor_frag =
|
||||
#include "ccShader_Position_uColor_frag.h"
|
||||
const GLchar * ccPosition_uColor_vert =
|
||||
#include "ccShader_Position_uColor_vert.h"
|
||||
|
||||
//
|
||||
const GLchar * ccPositionColor_frag =
|
||||
#include "ccShader_PositionColor_frag.h"
|
||||
const GLchar * ccPositionColor_vert =
|
||||
#include "ccShader_PositionColor_vert.h"
|
||||
|
||||
//
|
||||
const GLchar * ccPositionTexture_frag =
|
||||
#include "ccShader_PositionTexture_frag.h"
|
||||
const GLchar * ccPositionTexture_vert =
|
||||
#include "ccShader_PositionTexture_vert.h"
|
||||
|
||||
//
|
||||
const GLchar * ccPositionTextureA8Color_frag =
|
||||
#include "ccShader_PositionTextureA8Color_frag.h"
|
||||
const GLchar * ccPositionTextureA8Color_vert =
|
||||
#include "ccShader_PositionTextureA8Color_vert.h"
|
||||
|
||||
//
|
||||
const GLchar * ccPositionTextureColor_frag =
|
||||
#include "ccShader_PositionTextureColor_frag.h"
|
||||
const GLchar * ccPositionTextureColor_vert =
|
||||
#include "ccShader_PositionTextureColor_vert.h"
|
||||
|
||||
//
|
||||
const GLchar * ccPositionTextureColor_noMVP_frag =
|
||||
#include "ccShader_PositionTextureColor_noMVP_frag.h"
|
||||
const GLchar * ccPositionTextureColor_noMVP_vert =
|
||||
#include "ccShader_PositionTextureColor_noMVP_vert.h"
|
||||
|
||||
//
|
||||
const GLchar * ccPositionTextureColorAlphaTest_frag =
|
||||
#include "ccShader_PositionTextureColorAlphaTest_frag.h"
|
||||
|
||||
//
|
||||
const GLchar * ccPositionTexture_uColor_frag =
|
||||
#include "ccShader_PositionTexture_uColor_frag.h"
|
||||
const GLchar * ccPositionTexture_uColor_vert =
|
||||
#include "ccShader_PositionTexture_uColor_vert.h"
|
||||
|
||||
const GLchar * ccPositionColorLengthTexture_frag =
|
||||
#include "ccShader_PositionColorLengthTexture_frag.h"
|
||||
const GLchar * ccPositionColorLengthTexture_vert =
|
||||
#include "ccShader_PositionColorLengthTexture_vert.h"
|
||||
|
||||
const GLchar * ccLabelDistanceFieldNormal_frag =
|
||||
#include "ccShader_Label_frag_df.h"
|
||||
|
||||
const GLchar * ccLabelDistanceFieldGlow_frag =
|
||||
#include "ccShader_Label_frag_df_glow.h"
|
||||
|
||||
const GLchar * ccLabelNormal_frag =
|
||||
#include "ccShader_Label_frag_normal.h"
|
||||
|
||||
const GLchar * ccLabelOutline_frag =
|
||||
#include "ccShader_Label_frag_outline.h"
|
||||
|
||||
const GLchar * ccLabel_vert =
|
||||
#include "ccShader_Label_vert.h"
|
||||
|
||||
NS_CC_END
|
||||
|
|
@ -1,127 +1,36 @@
|
|||
/*
|
||||
* This file uses some implementations of gutf8.c in glib.
|
||||
*
|
||||
* gutf8.c - Operations on UTF-8 strings.
|
||||
*
|
||||
* Copyright (C) 1999 Tom Tromey
|
||||
* Copyright (C) 2000 Red Hat, Inc.
|
||||
* Copyright (c) 2013-2014 Chukong Technologies Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
/****************************************************************************
|
||||
Copyright (c) 2014 cocos2d-x.org
|
||||
Copyright (c) 2014 Chukong Technologies Inc.
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "ccUTF8.h"
|
||||
#include "2d/platform/CCCommon.h"
|
||||
#include "base/CCConsole.h"
|
||||
#include "ConvertUTF.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
int cc_wcslen(const unsigned short* str)
|
||||
{
|
||||
int i=0;
|
||||
while(*str++) i++;
|
||||
return i;
|
||||
}
|
||||
|
||||
/* Code from GLIB gutf8.c starts here. */
|
||||
|
||||
#define UTF8_COMPUTE(Char, Mask, Len) \
|
||||
if (Char < 128) \
|
||||
{ \
|
||||
Len = 1; \
|
||||
Mask = 0x7f; \
|
||||
} \
|
||||
else if ((Char & 0xe0) == 0xc0) \
|
||||
{ \
|
||||
Len = 2; \
|
||||
Mask = 0x1f; \
|
||||
} \
|
||||
else if ((Char & 0xf0) == 0xe0) \
|
||||
{ \
|
||||
Len = 3; \
|
||||
Mask = 0x0f; \
|
||||
} \
|
||||
else if ((Char & 0xf8) == 0xf0) \
|
||||
{ \
|
||||
Len = 4; \
|
||||
Mask = 0x07; \
|
||||
} \
|
||||
else if ((Char & 0xfc) == 0xf8) \
|
||||
{ \
|
||||
Len = 5; \
|
||||
Mask = 0x03; \
|
||||
} \
|
||||
else if ((Char & 0xfe) == 0xfc) \
|
||||
{ \
|
||||
Len = 6; \
|
||||
Mask = 0x01; \
|
||||
} \
|
||||
else \
|
||||
Len = -1;
|
||||
|
||||
#define UTF8_LENGTH(Char) \
|
||||
((Char) < 0x80 ? 1 : \
|
||||
((Char) < 0x800 ? 2 : \
|
||||
((Char) < 0x10000 ? 3 : \
|
||||
((Char) < 0x200000 ? 4 : \
|
||||
((Char) < 0x4000000 ? 5 : 6)))))
|
||||
|
||||
|
||||
#define UTF8_GET(Result, Chars, Count, Mask, Len) \
|
||||
(Result) = (Chars)[0] & (Mask); \
|
||||
for ((Count) = 1; (Count) < (Len); ++(Count)) \
|
||||
{ \
|
||||
if (((Chars)[(Count)] & 0xc0) != 0x80) \
|
||||
{ \
|
||||
(Result) = -1; \
|
||||
break; \
|
||||
} \
|
||||
(Result) <<= 6; \
|
||||
(Result) |= ((Chars)[(Count)] & 0x3f); \
|
||||
}
|
||||
|
||||
#define UNICODE_VALID(Char) \
|
||||
((Char) < 0x110000 && \
|
||||
(((Char) & 0xFFFFF800) != 0xD800) && \
|
||||
((Char) < 0xFDD0 || (Char) > 0xFDEF) && \
|
||||
((Char) & 0xFFFE) != 0xFFFE)
|
||||
|
||||
|
||||
static const char utf8_skip_data[256] = {
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1,
|
||||
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
||||
2, 2, 2, 2, 2, 2, 2,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5,
|
||||
5, 5, 5, 6, 6, 1, 1
|
||||
};
|
||||
|
||||
static const char *const g_utf8_skip = utf8_skip_data;
|
||||
|
||||
#define cc_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(unsigned char *)(p)])
|
||||
namespace StringUtils {
|
||||
|
||||
/*
|
||||
* @str: the string to search through.
|
||||
|
|
@ -129,7 +38,7 @@ static const char *const g_utf8_skip = utf8_skip_data;
|
|||
*
|
||||
* Return value: the index of the last character that is not c.
|
||||
* */
|
||||
unsigned int cc_utf8_find_last_not_char(std::vector<unsigned short> str, unsigned short c)
|
||||
unsigned int getIndexOfLastNotChar16(const std::vector<char16_t>& str, char16_t c)
|
||||
{
|
||||
int len = static_cast<int>(str.size());
|
||||
|
||||
|
|
@ -148,13 +57,13 @@ unsigned int cc_utf8_find_last_not_char(std::vector<unsigned short> str, unsigne
|
|||
*
|
||||
* Return value: the trimmed string.
|
||||
* */
|
||||
static void cc_utf8_trim_from(std::vector<unsigned short>* str, int index)
|
||||
static void trimUTF16VectorFromIndex(std::vector<char16_t>& str, int index)
|
||||
{
|
||||
int size = static_cast<int>(str->size());
|
||||
int size = static_cast<int>(str.size());
|
||||
if (index >= size || index < 0)
|
||||
return;
|
||||
|
||||
str->erase(str->begin() + index, str->begin() + size);
|
||||
str.erase(str.begin() + index, str.begin() + size);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -164,14 +73,14 @@ static void cc_utf8_trim_from(std::vector<unsigned short>* str, int index)
|
|||
*
|
||||
* Return value: weather the character is a whitespace character.
|
||||
* */
|
||||
bool isspace_unicode(unsigned short ch)
|
||||
bool isUnicodeSpace(char16_t ch)
|
||||
{
|
||||
return (ch >= 0x0009 && ch <= 0x000D) || ch == 0x0020 || ch == 0x0085 || ch == 0x00A0 || ch == 0x1680
|
||||
|| (ch >= 0x2000 && ch <= 0x200A) || ch == 0x2028 || ch == 0x2029 || ch == 0x202F
|
||||
|| ch == 0x205F || ch == 0x3000;
|
||||
}
|
||||
|
||||
bool iscjk_unicode(unsigned short ch)
|
||||
bool isCJKUnicode(char16_t ch)
|
||||
{
|
||||
return (ch >= 0x4E00 && ch <= 0x9FBF) // CJK Unified Ideographs
|
||||
|| (ch >= 0x2E80 && ch <= 0x2FDF) // CJK Radicals Supplement & Kangxi Radicals
|
||||
|
|
@ -183,9 +92,9 @@ bool iscjk_unicode(unsigned short ch)
|
|||
|| (ch >= 0x31C0 && ch <= 0x4DFF); // Other exiensions
|
||||
}
|
||||
|
||||
void cc_utf8_trim_ws(std::vector<unsigned short>* str)
|
||||
void trimUTF16Vector(std::vector<char16_t>& str)
|
||||
{
|
||||
int len = static_cast<int>(str->size());
|
||||
int len = static_cast<int>(str.size());
|
||||
|
||||
if ( len <= 0 )
|
||||
return;
|
||||
|
|
@ -193,126 +102,137 @@ void cc_utf8_trim_ws(std::vector<unsigned short>* str)
|
|||
int last_index = len - 1;
|
||||
|
||||
// Only start trimming if the last character is whitespace..
|
||||
if (isspace_unicode((*str)[last_index]))
|
||||
if (isUnicodeSpace(str[last_index]))
|
||||
{
|
||||
for (int i = last_index - 1; i >= 0; --i)
|
||||
{
|
||||
if (isspace_unicode((*str)[i]))
|
||||
if (isUnicodeSpace(str[i]))
|
||||
last_index = i;
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
cc_utf8_trim_from(str, last_index);
|
||||
trimUTF16VectorFromIndex(str, last_index);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* cc_utf8_strlen:
|
||||
* @p: pointer to the start of a UTF-8 encoded string.
|
||||
* @max: the maximum number of bytes to examine. If @max
|
||||
* is less than 0, then the string is assumed to be
|
||||
* null-terminated. If @max is 0, @p will not be examined and
|
||||
* may be %nullptr.
|
||||
*
|
||||
* Returns the length of the string in characters.
|
||||
*
|
||||
* Return value: the length of the string in characters
|
||||
**/
|
||||
long
|
||||
cc_utf8_strlen (const char * p, int max)
|
||||
bool UTF8ToUTF16(const std::string& utf8, std::u16string& outUtf16)
|
||||
{
|
||||
long len = 0;
|
||||
const char *start = p;
|
||||
|
||||
if (!(p != nullptr || max == 0))
|
||||
if (utf8.empty())
|
||||
{
|
||||
return 0;
|
||||
outUtf16.clear();
|
||||
return true;
|
||||
}
|
||||
|
||||
if (max < 0)
|
||||
bool ret = false;
|
||||
|
||||
const size_t utf16Bytes = (utf8.length()+1) * sizeof(char16_t);
|
||||
char16_t* utf16 = (char16_t*)malloc(utf16Bytes);
|
||||
memset(utf16, 0, utf16Bytes);
|
||||
|
||||
char* utf16ptr = reinterpret_cast<char*>(utf16);
|
||||
const UTF8* error = nullptr;
|
||||
|
||||
if (llvm::ConvertUTF8toWide(2, utf8, utf16ptr, error))
|
||||
{
|
||||
while (*p)
|
||||
outUtf16 = utf16;
|
||||
ret = true;
|
||||
}
|
||||
|
||||
free(utf16);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool UTF16ToUTF8(const std::u16string& utf16, std::string& outUtf8)
|
||||
{
|
||||
p = cc_utf8_next_char (p);
|
||||
++len;
|
||||
}
|
||||
}
|
||||
else
|
||||
if (utf16.empty())
|
||||
{
|
||||
if (max == 0 || !*p)
|
||||
return 0;
|
||||
outUtf8.clear();
|
||||
return true;
|
||||
}
|
||||
|
||||
p = cc_utf8_next_char (p);
|
||||
return llvm::convertUTF16ToUTF8String(utf16, outUtf8);
|
||||
}
|
||||
|
||||
while (p - start < max && *p)
|
||||
std::vector<char16_t> getChar16VectorFromUTF16String(const std::u16string& utf16)
|
||||
{
|
||||
++len;
|
||||
p = cc_utf8_next_char (p);
|
||||
}
|
||||
|
||||
/* only do the last len increment if we got a complete
|
||||
* char (don't count partial chars)
|
||||
*/
|
||||
if (p - start == max)
|
||||
++len;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
/*
|
||||
* g_utf8_get_char:
|
||||
* @p: a pointer to Unicode character encoded as UTF-8
|
||||
*
|
||||
* Converts a sequence of bytes encoded as UTF-8 to a Unicode character.
|
||||
* If @p does not point to a valid UTF-8 encoded character, results are
|
||||
* undefined. If you are not sure that the bytes are complete
|
||||
* valid Unicode characters, you should use g_utf8_get_char_validated()
|
||||
* instead.
|
||||
*
|
||||
* Return value: the resulting character
|
||||
**/
|
||||
static unsigned int
|
||||
cc_utf8_get_char (const char * p)
|
||||
std::vector<char16_t> ret;
|
||||
size_t len = utf16.length();
|
||||
ret.reserve(len);
|
||||
for (size_t i = 0; i < len; ++i)
|
||||
{
|
||||
int i, mask = 0, len;
|
||||
unsigned int result;
|
||||
unsigned char c = (unsigned char) *p;
|
||||
|
||||
UTF8_COMPUTE (c, mask, len);
|
||||
if (len == -1)
|
||||
return (unsigned int) - 1;
|
||||
UTF8_GET (result, p, i, mask, len);
|
||||
|
||||
return result;
|
||||
ret.push_back(utf16[i]);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
unsigned short* cc_utf8_to_utf16(const char* str_old, int length/* = -1 */, int* rUtf16Size/* = nullptr */)
|
||||
long getCharacterCountInUTF8String(const std::string& utf8)
|
||||
{
|
||||
long len = cc_utf8_strlen(str_old, length);
|
||||
if (rUtf16Size != nullptr) {
|
||||
*rUtf16Size = static_cast<int>(len);
|
||||
return getUTF8StringLength((const UTF8*)utf8.c_str());
|
||||
}
|
||||
|
||||
unsigned short* str_new = new unsigned short[len + 1];
|
||||
str_new[len] = 0;
|
||||
} //namespace StringUtils {
|
||||
|
||||
for (int i = 0; i < len; ++i)
|
||||
|
||||
int cc_wcslen(const unsigned short* str)
|
||||
{
|
||||
str_new[i] = cc_utf8_get_char(str_old);
|
||||
str_old = cc_utf8_next_char(str_old);
|
||||
if (str == nullptr)
|
||||
return -1;
|
||||
int i=0;
|
||||
while(*str++) i++;
|
||||
return i;
|
||||
}
|
||||
|
||||
return str_new;
|
||||
void cc_utf8_trim_ws(std::vector<unsigned short>* str)
|
||||
{
|
||||
if (str == nullptr)
|
||||
return;
|
||||
// unsigned short and char16_t are both 2 bytes
|
||||
std::vector<char16_t>* ret = reinterpret_cast<std::vector<char16_t>*>(str);
|
||||
StringUtils::trimUTF16Vector(*ret);
|
||||
}
|
||||
|
||||
bool isspace_unicode(unsigned short ch)
|
||||
{
|
||||
return StringUtils::isUnicodeSpace(ch);
|
||||
}
|
||||
|
||||
|
||||
bool iscjk_unicode(unsigned short ch)
|
||||
{
|
||||
return StringUtils::isCJKUnicode(ch);
|
||||
}
|
||||
|
||||
|
||||
long cc_utf8_strlen (const char * p, int max)
|
||||
{
|
||||
CC_UNUSED_PARAM(max);
|
||||
if (p == nullptr)
|
||||
return -1;
|
||||
return StringUtils::getCharacterCountInUTF8String(p);
|
||||
}
|
||||
|
||||
unsigned int cc_utf8_find_last_not_char(const std::vector<unsigned short>& str, unsigned short c)
|
||||
{
|
||||
std::vector<char16_t> char16Vector;
|
||||
for (const auto& e : str)
|
||||
{
|
||||
char16Vector.push_back(e);
|
||||
}
|
||||
|
||||
return StringUtils::getIndexOfLastNotChar16(char16Vector, c);
|
||||
}
|
||||
|
||||
std::vector<unsigned short> cc_utf16_vec_from_utf16_str(const unsigned short* str)
|
||||
{
|
||||
int len = cc_wcslen(str);
|
||||
std::vector<unsigned short> str_new;
|
||||
|
||||
if (str == nullptr)
|
||||
return str_new;
|
||||
|
||||
int len = cc_wcslen(str);
|
||||
|
||||
for (int i = 0; i < len; ++i)
|
||||
{
|
||||
str_new.push_back(str[i]);
|
||||
|
|
@ -320,209 +240,60 @@ std::vector<unsigned short> cc_utf16_vec_from_utf16_str(const unsigned short* st
|
|||
return str_new;
|
||||
}
|
||||
|
||||
/**
|
||||
* cc_unichar_to_utf8:
|
||||
* @c: a ISO10646 character code
|
||||
* @outbuf: output buffer, must have at least 6 bytes of space.
|
||||
* If %nullptr, the length will be computed and returned
|
||||
* and nothing will be written to @outbuf.
|
||||
*
|
||||
* Converts a single character to UTF-8.
|
||||
*
|
||||
* Return value: number of bytes written
|
||||
**/
|
||||
int
|
||||
cc_unichar_to_utf8 (unsigned int c,
|
||||
char *outbuf)
|
||||
unsigned short* cc_utf8_to_utf16(const char* str_old, int length/* = -1*/, int* rUtf16Size/* = nullptr*/)
|
||||
{
|
||||
int len = 0;
|
||||
int first;
|
||||
int i;
|
||||
if (str_old == nullptr)
|
||||
return nullptr;
|
||||
|
||||
if (c < 0x80)
|
||||
unsigned short* ret = nullptr;
|
||||
|
||||
std::u16string outUtf16;
|
||||
bool succeed = StringUtils::UTF8ToUTF16(str_old, outUtf16);
|
||||
|
||||
if (succeed)
|
||||
{
|
||||
first = 0;
|
||||
len = 1;
|
||||
ret = new unsigned short[outUtf16.length() + 1];
|
||||
ret[outUtf16.length()] = 0;
|
||||
memcpy(ret, outUtf16.data(), outUtf16.length() * sizeof(unsigned short));
|
||||
if (rUtf16Size)
|
||||
{
|
||||
*rUtf16Size = static_cast<int>(outUtf16.length());
|
||||
}
|
||||
else if (c < 0x800)
|
||||
{
|
||||
first = 0xc0;
|
||||
len = 2;
|
||||
}
|
||||
else if (c < 0x10000)
|
||||
{
|
||||
first = 0xe0;
|
||||
len = 3;
|
||||
}
|
||||
else if (c < 0x200000)
|
||||
{
|
||||
first = 0xf0;
|
||||
len = 4;
|
||||
}
|
||||
else if (c < 0x4000000)
|
||||
{
|
||||
first = 0xf8;
|
||||
len = 5;
|
||||
}
|
||||
else
|
||||
{
|
||||
first = 0xfc;
|
||||
len = 6;
|
||||
}
|
||||
|
||||
if (outbuf)
|
||||
{
|
||||
for (i = len - 1; i > 0; --i)
|
||||
{
|
||||
outbuf[i] = (c & 0x3f) | 0x80;
|
||||
c >>= 6;
|
||||
}
|
||||
outbuf[0] = c | first;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
#define SURROGATE_VALUE(h,l) (((h) - 0xd800) * 0x400 + (l) - 0xdc00 + 0x10000)
|
||||
|
||||
/**
|
||||
* cc_utf16_to_utf8:
|
||||
* @str: a UTF-16 encoded string
|
||||
* @len: the maximum length of @str to use. If @len < 0, then
|
||||
* the string is terminated with a 0 character.
|
||||
* @items_read: location to store number of words read, or %nullptr.
|
||||
* If %nullptr, then %G_CONVERT_ERROR_PARTIAL_INPUT will be
|
||||
* returned in case @str contains a trailing partial
|
||||
* character. If an error occurs then the index of the
|
||||
* invalid input is stored here.
|
||||
* @items_written: location to store number of bytes written, or %nullptr.
|
||||
* The value stored here does not include the trailing
|
||||
* 0 byte.
|
||||
* @error: location to store the error occuring, or %nullptr to ignore
|
||||
* errors. Any of the errors in #GConvertError other than
|
||||
* %G_CONVERT_ERROR_NO_CONVERSION may occur.
|
||||
*
|
||||
* Convert a string from UTF-16 to UTF-8. The result will be
|
||||
* terminated with a 0 byte.
|
||||
*
|
||||
* Return value: a pointer to a newly allocated UTF-8 string.
|
||||
* This value must be freed with free(). If an
|
||||
* error occurs, %nullptr will be returned and
|
||||
* @error set.
|
||||
**/
|
||||
char *
|
||||
cc_utf16_to_utf8 (const unsigned short *str,
|
||||
char * cc_utf16_to_utf8 (const unsigned short *str,
|
||||
int len,
|
||||
long *items_read,
|
||||
long *items_written)
|
||||
{
|
||||
/* This function and g_utf16_to_ucs4 are almost exactly identical - The lines that differ
|
||||
* are marked.
|
||||
*/
|
||||
const unsigned short *in;
|
||||
char *out;
|
||||
char *result = nullptr;
|
||||
int n_bytes;
|
||||
unsigned int high_surrogate;
|
||||
if (str == nullptr)
|
||||
return nullptr;
|
||||
|
||||
if (str == 0) return nullptr;
|
||||
|
||||
n_bytes = 0;
|
||||
in = str;
|
||||
high_surrogate = 0;
|
||||
while ((len < 0 || in - str < len) && *in)
|
||||
std::u16string utf16;
|
||||
int utf16Len = len < 0 ? cc_wcslen(str) : len;
|
||||
|
||||
for (int i = 0; i < utf16Len; ++i)
|
||||
{
|
||||
unsigned short c = *in;
|
||||
unsigned int wc;
|
||||
utf16.push_back(str[i]);
|
||||
}
|
||||
|
||||
if (c >= 0xdc00 && c < 0xe000) /* low surrogate */
|
||||
char* ret = nullptr;
|
||||
std::string outUtf8;
|
||||
bool succeed = StringUtils::UTF16ToUTF8(utf16, outUtf8);
|
||||
|
||||
if (succeed)
|
||||
{
|
||||
if (high_surrogate)
|
||||
{
|
||||
wc = SURROGATE_VALUE (high_surrogate, c);
|
||||
high_surrogate = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
CCLOGERROR("Invalid sequence in conversion input");
|
||||
goto err_out;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (high_surrogate)
|
||||
{
|
||||
CCLOGERROR("Invalid sequence in conversion input");
|
||||
goto err_out;
|
||||
ret = new char[outUtf8.length() + 1];
|
||||
ret[outUtf8.length()] = '\0';
|
||||
memcpy(ret, outUtf8.data(), outUtf8.length());
|
||||
}
|
||||
|
||||
if (c >= 0xd800 && c < 0xdc00) /* high surrogate */
|
||||
{
|
||||
high_surrogate = c;
|
||||
goto next1;
|
||||
}
|
||||
else
|
||||
wc = c;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/********** DIFFERENT for UTF8/UCS4 **********/
|
||||
n_bytes += UTF8_LENGTH (wc);
|
||||
|
||||
next1:
|
||||
in++;
|
||||
}
|
||||
|
||||
if (high_surrogate && !items_read)
|
||||
{
|
||||
CCLOGERROR("Partial character sequence at end of input");
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
/* At this point, everything is valid, and we just need to convert
|
||||
*/
|
||||
/********** DIFFERENT for UTF8/UCS4 **********/
|
||||
result = new char[n_bytes + 1];
|
||||
|
||||
high_surrogate = 0;
|
||||
out = result;
|
||||
in = str;
|
||||
while (out < result + n_bytes)
|
||||
{
|
||||
unsigned short c = *in;
|
||||
unsigned int wc;
|
||||
|
||||
if (c >= 0xdc00 && c < 0xe000) /* low surrogate */
|
||||
{
|
||||
wc = SURROGATE_VALUE (high_surrogate, c);
|
||||
high_surrogate = 0;
|
||||
}
|
||||
else if (c >= 0xd800 && c < 0xdc00) /* high surrogate */
|
||||
{
|
||||
high_surrogate = c;
|
||||
goto next2;
|
||||
}
|
||||
else
|
||||
wc = c;
|
||||
|
||||
/********** DIFFERENT for UTF8/UCS4 **********/
|
||||
out += cc_unichar_to_utf8 (wc, out);
|
||||
|
||||
next2:
|
||||
in++;
|
||||
}
|
||||
|
||||
/********** DIFFERENT for UTF8/UCS4 **********/
|
||||
*out = '\0';
|
||||
|
||||
if (items_written)
|
||||
/********** DIFFERENT for UTF8/UCS4 **********/
|
||||
*items_written = out - result;
|
||||
|
||||
err_out:
|
||||
if (items_read)
|
||||
*items_read = in - str;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -1,113 +1,217 @@
|
|||
/*
|
||||
* Copyright (C) 1999 Tom Tromey
|
||||
* Copyright (C) 2000 Red Hat, Inc.
|
||||
* Copyright (c) 2013-2014 Chukong Technologies Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
/****************************************************************************
|
||||
Copyright (c) 2014 cocos2d-x.org
|
||||
Copyright (c) 2014 Chukong Technologies Inc.
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __cocos2dx__ccUTF8__
|
||||
#define __cocos2dx__ccUTF8__
|
||||
|
||||
#include "base/CCPlatformMacros.h"
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
CC_DLL int cc_wcslen(const unsigned short* str);
|
||||
|
||||
CC_DLL void cc_utf8_trim_ws(std::vector<unsigned short>* str);
|
||||
namespace StringUtils {
|
||||
|
||||
/**
|
||||
* Whether the character is a whitespace character.
|
||||
* @brief Converts utf8 string to utf16 string
|
||||
* @param utf8 The utf8 string to be converted
|
||||
* @param outUtf16 The output utf16 string
|
||||
* @return true if succeed, otherwise false
|
||||
* @note Please check the return value before using \p outUtf16
|
||||
* e.g.
|
||||
* @code
|
||||
* std::u16string utf16;
|
||||
* bool ret = StringUtils::UTF8ToUTF16("你好hello", utf16);
|
||||
* if (ret) {
|
||||
* do_some_thing_with_utf16(utf16);
|
||||
* }
|
||||
* @endcode
|
||||
*/
|
||||
CC_DLL bool UTF8ToUTF16(const std::string& utf8, std::u16string& outUtf16);
|
||||
|
||||
/**
|
||||
* @brief Converts utf16 string to utf8 string
|
||||
* @param utf16 The utf16 string to be converted
|
||||
* @param outUtf8 The output utf8 string
|
||||
* @return true if succeed, otherwise false
|
||||
* @note Please check the return value before using \p outUtf8
|
||||
* e.g.
|
||||
* @code
|
||||
* std::string utf8;
|
||||
* bool ret = StringUtils::UTF16ToUTF8(u"\u4f60\u597d", utf16);
|
||||
* if (ret) {
|
||||
* do_some_thing_with_utf8(utf8);
|
||||
* }
|
||||
* @endcode
|
||||
*/
|
||||
CC_DLL bool UTF16ToUTF8(const std::u16string& utf16, std::string& outUtf8);
|
||||
|
||||
/**
|
||||
* @brief Trims the unicode spaces at the end of char16_t vector
|
||||
*/
|
||||
CC_DLL void trimUTF16Vector(std::vector<char16_t>& str);
|
||||
|
||||
/**
|
||||
* @brief Whether the character is a whitespace character.
|
||||
*
|
||||
* @param ch the unicode character
|
||||
* @returns whether the character is a white space character.
|
||||
*
|
||||
* @see http://en.wikipedia.org/wiki/Whitespace_character#Unicode
|
||||
* */
|
||||
CC_DLL bool isspace_unicode(unsigned short ch);
|
||||
*
|
||||
*/
|
||||
CC_DLL bool isUnicodeSpace(char16_t ch);
|
||||
|
||||
/**
|
||||
* Whether the character is a Chinese/Japanese/Korean character.
|
||||
* @brief Whether the character is a Chinese/Japanese/Korean character.
|
||||
*
|
||||
* @param ch the unicode character
|
||||
* @returns whether the character is a Chinese character.
|
||||
*
|
||||
* @see http://www.searchtb.com/2012/04/chinese_encode.html
|
||||
* @see http://tieba.baidu.com/p/748765987
|
||||
*
|
||||
*/
|
||||
CC_DLL bool isCJKUnicode(char16_t ch);
|
||||
|
||||
/**
|
||||
* @brief Returns the length of the string in characters.
|
||||
*
|
||||
* @param utf8 an UTF-8 encoded string.
|
||||
* @returns the length of the string in characters
|
||||
*/
|
||||
CC_DLL long getCharacterCountInUTF8String(const std::string& utf8);
|
||||
|
||||
/**
|
||||
* @brief Gets the index of the last character that is not equal to the character given.
|
||||
*
|
||||
* @param str the string to be searched.
|
||||
* @param c the character to be searched for.
|
||||
*
|
||||
* @returns the index of the last character that is not \p c.
|
||||
*
|
||||
*/
|
||||
CC_DLL unsigned int getIndexOfLastNotChar16(const std::vector<char16_t>& str, char16_t c);
|
||||
|
||||
/**
|
||||
* @brief Gets char16_t vector from a given utf16 string
|
||||
*/
|
||||
CC_DLL std::vector<char16_t> getChar16VectorFromUTF16String(const std::u16string& utf16);
|
||||
|
||||
} // namespace StringUtils {
|
||||
|
||||
/**
|
||||
* Returns the character count in UTF16 string
|
||||
* @param str pointer to the start of a UTF-16 encoded string. It must be an NULL terminal UTF8 string.
|
||||
* @deprecated Please use c++11 `std::u16string::length` instead, don't use `unsigned short*` directly
|
||||
*/
|
||||
CC_DEPRECATED_ATTRIBUTE CC_DLL int cc_wcslen(const unsigned short* str);
|
||||
|
||||
/** Trims the space characters at the end of UTF8 string
|
||||
* @deprecated Please use `StringUtils::trimUTF16Vector` instead
|
||||
*/
|
||||
|
||||
CC_DEPRECATED_ATTRIBUTE void cc_utf8_trim_ws(std::vector<unsigned short>* str);
|
||||
|
||||
/**
|
||||
* Whether the character is a whitespace character.
|
||||
*
|
||||
* @param ch the unicode character
|
||||
* @returns whether the character is a white space character.
|
||||
* @deprecated Please use `StringUtils::isUnicodeSpace` instead
|
||||
*
|
||||
* @see http://en.wikipedia.org/wiki/Whitespace_character#Unicode
|
||||
* */
|
||||
CC_DLL bool iscjk_unicode(unsigned short ch);
|
||||
CC_DEPRECATED_ATTRIBUTE bool isspace_unicode(unsigned short ch);
|
||||
|
||||
/**
|
||||
* Whether the character is a Chinese/Japanese/Korean character.
|
||||
*
|
||||
* @param ch the unicode character
|
||||
* @returns whether the character is a Chinese character.
|
||||
* @deprecated Please use `StringUtils::isCJKUnicode` instead
|
||||
*
|
||||
* @see http://www.searchtb.com/2012/04/chinese_encode.html
|
||||
* @see http://tieba.baidu.com/p/748765987
|
||||
* */
|
||||
CC_DEPRECATED_ATTRIBUTE bool iscjk_unicode(unsigned short ch);
|
||||
|
||||
/**
|
||||
* Returns the length of the string in characters.
|
||||
*
|
||||
* @param p pointer to the start of a UTF-8 encoded string.
|
||||
* @param max the maximum number of bytes to examine. If \p max is less than
|
||||
* 0, then the string is assumed to be null-terminated. If \p max
|
||||
* is 0, \p p will not be examined and my be %nullptr.
|
||||
*
|
||||
* @param p pointer to the start of a UTF-8 encoded string. It must be an NULL terminal UTF8 string.
|
||||
* @param max Not used from 3.1, just keep it for backward compatibility
|
||||
* @deprecated Please use `StringUtils::getCharacterCountInUTF8String` instead
|
||||
* @returns the length of the string in characters
|
||||
**/
|
||||
CC_DLL long
|
||||
cc_utf8_strlen (const char * p, int max);
|
||||
CC_DEPRECATED_ATTRIBUTE long cc_utf8_strlen (const char * p, int max = -1);
|
||||
|
||||
/**
|
||||
* Find the last character that is not equal to the character given.
|
||||
*
|
||||
* @param str the string to be searched.
|
||||
* @param c the character to be searched for.
|
||||
*
|
||||
* @deprecated Please use `StringUtils::getIndexOfLastNotChar16` instead
|
||||
* @returns the index of the last character that is not \p c.
|
||||
* */
|
||||
CC_DLL unsigned int cc_utf8_find_last_not_char(std::vector<unsigned short> str, unsigned short c);
|
||||
|
||||
CC_DLL std::vector<unsigned short> cc_utf16_vec_from_utf16_str(const unsigned short* str);
|
||||
CC_DEPRECATED_ATTRIBUTE unsigned int cc_utf8_find_last_not_char(const std::vector<unsigned short>& str, unsigned short c);
|
||||
|
||||
/**
|
||||
* Creates a utf8 string from a cstring.
|
||||
* @brief Gets `unsigned short` vector from a given utf16 string
|
||||
* @deprecated Please use `StringUtils::getChar16VectorFromUTF16String` instead
|
||||
*/
|
||||
CC_DEPRECATED_ATTRIBUTE std::vector<unsigned short> cc_utf16_vec_from_utf16_str(const unsigned short* str);
|
||||
|
||||
/**
|
||||
* Creates an utf8 string from a c string. The result will be null terminated.
|
||||
*
|
||||
* @param str_old pointer to the start of a C string.
|
||||
*
|
||||
* @returns the newly created utf8 string.
|
||||
* @param str_old pointer to the start of a C string. It must be an NULL terminal UTF8 string.
|
||||
* @param length not used from 3.1, keep it just for backward compatibility
|
||||
* @param rUtf16Size The character count in the return UTF16 string.
|
||||
* @deprecated Please use `StringUtils::UTF8ToUTF16` instead
|
||||
* @returns the newly created utf16 string, it must be released with `delete[]`,
|
||||
* If an error occurs, %NULL will be returned.
|
||||
* */
|
||||
CC_DLL unsigned short* cc_utf8_to_utf16(const char* str_old, int length = -1, int* rUtf16Size = nullptr);
|
||||
CC_DEPRECATED_ATTRIBUTE unsigned short* cc_utf8_to_utf16(const char* str_old, int length = -1, int* rUtf16Size = nullptr);
|
||||
|
||||
/**
|
||||
* Convert a string from UTF-16 to UTF-8. The result will be null terminated.
|
||||
*
|
||||
* @param str a UTF-16 encoded string
|
||||
* @param len the maximum length of \p str to use. If \p len < 0, then the
|
||||
* string is null terminated.
|
||||
* @param items_read location to store number of words read, or %nullptr.
|
||||
* If %nullptr, then %G_CONVERT_ERROR_PARTIAL_INPUT will be
|
||||
* returned in case \p str contains a trailing partial
|
||||
* character. If an error occurs then the index of the
|
||||
* invalid input is stored here.
|
||||
* @param items_written location to store number of bytes written, or %nullptr.
|
||||
* The value stored here does not include the trailing null.
|
||||
* Converts a string from UTF-16 to UTF-8. The result will be null terminated.
|
||||
*
|
||||
* @param utf16 an UTF-16 encoded string, It must be an NULL terminal UTF16 string.
|
||||
* @param len not used from 3.1, keep it just for backward compatibility
|
||||
* @param items_read not used from 3.1, keep it just for backward compatibility
|
||||
* @param items_written not used from 3.1, keep it just for backward compatibility
|
||||
* @deprecated Please use `StringUtils::UTF16ToUTF8` instead
|
||||
* @returns a pointer to a newly allocated UTF-8 string. This value must be
|
||||
* freed with free(). If an error occurs, %nullptr will be returned.
|
||||
* released with `delete[]`. If an error occurs, %NULL will be returned.
|
||||
**/
|
||||
CC_DLL char *
|
||||
cc_utf16_to_utf8 (const unsigned short *str,
|
||||
int len,
|
||||
long *items_read,
|
||||
long *items_written);
|
||||
CC_DEPRECATED_ATTRIBUTE char * cc_utf16_to_utf8 (const unsigned short *str,
|
||||
int len = -1,
|
||||
long *items_read = nullptr,
|
||||
long *items_written = nullptr);
|
||||
|
||||
|
||||
NS_CC_END
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
|
|
@ -125,7 +125,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
|
|
@ -168,6 +168,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c" />
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp" />
|
||||
<ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp" />
|
||||
<ClCompile Include="..\..\external\tinyxml2\tinyxml2.cpp" />
|
||||
<ClCompile Include="..\..\external\unzip\ioapi.cpp" />
|
||||
|
|
@ -234,10 +236,16 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgram.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramCache.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramState.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\ccGLStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGroupCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCQuadCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderer.cpp" />
|
||||
<ClCompile Include="..\renderer\ccShaders.cpp" />
|
||||
<ClCompile Include="CCAction.cpp" />
|
||||
<ClCompile Include="CCActionCamera.cpp" />
|
||||
<ClCompile Include="CCActionCatmullRom.cpp" />
|
||||
|
|
@ -267,8 +275,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="CCFontFNT.cpp" />
|
||||
<ClCompile Include="CCFontFreeType.cpp" />
|
||||
<ClCompile Include="ccFPSImages.c" />
|
||||
<ClCompile Include="CCGLProgram.cpp" />
|
||||
<ClCompile Include="ccGLStateCache.cpp" />
|
||||
<ClCompile Include="CCGrabber.cpp" />
|
||||
<ClCompile Include="CCGrid.cpp" />
|
||||
<ClCompile Include="CCNodeGrid.cpp" />
|
||||
|
|
@ -292,8 +298,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="CCRenderTexture.cpp" />
|
||||
<ClCompile Include="CCScene.cpp" />
|
||||
<ClCompile Include="CCScriptSupport.cpp" />
|
||||
<ClCompile Include="CCShaderCache.cpp" />
|
||||
<ClCompile Include="ccShaders.cpp" />
|
||||
<ClCompile Include="CCSprite.cpp" />
|
||||
<ClCompile Include="CCSpriteBatchNode.cpp" />
|
||||
<ClCompile Include="CCSpriteFrame.cpp" />
|
||||
|
|
@ -329,6 +333,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="TGAlib.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
|
||||
<ClInclude Include="..\..\external\edtaa3func\edtaa3func.h" />
|
||||
<ClInclude Include="..\..\external\tinyxml2\tinyxml2.h" />
|
||||
<ClInclude Include="..\..\external\unzip\ioapi.h" />
|
||||
|
|
@ -410,11 +415,17 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
|
||||
<ClInclude Include="..\renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgram.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramCache.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramState.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramStateCache.h" />
|
||||
<ClInclude Include="..\renderer\ccGLStateCache.h" />
|
||||
<ClInclude Include="..\renderer\CCGroupCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCQuadCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommandPool.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderer.h" />
|
||||
<ClInclude Include="..\renderer\ccShaders.h" />
|
||||
<ClInclude Include="CCAction.h" />
|
||||
<ClInclude Include="CCActionCamera.h" />
|
||||
<ClInclude Include="CCActionCatmullRom.h" />
|
||||
|
|
@ -444,8 +455,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClInclude Include="CCFontFNT.h" />
|
||||
<ClInclude Include="CCFontFreeType.h" />
|
||||
<ClInclude Include="ccFPSImages.h" />
|
||||
<ClInclude Include="CCGLProgram.h" />
|
||||
<ClInclude Include="ccGLStateCache.h" />
|
||||
<ClInclude Include="CCGrabber.h" />
|
||||
<ClInclude Include="CCGrid.h" />
|
||||
<ClInclude Include="CCNodeGrid.h" />
|
||||
|
|
@ -471,24 +480,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClInclude Include="CCRenderTexture.h" />
|
||||
<ClInclude Include="CCScene.h" />
|
||||
<ClInclude Include="CCScriptSupport.h" />
|
||||
<ClInclude Include="CCShaderCache.h" />
|
||||
<ClInclude Include="ccShaderEx_SwitchMask_frag.h" />
|
||||
<ClInclude Include="ccShaders.h" />
|
||||
<ClInclude Include="ccShader_PositionColorLengthTexture_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionColorLengthTexture_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionColor_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionColor_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureA8Color_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureA8Color_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureColorAlphaTest_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureColor_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureColor_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_uColor_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_uColor_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_vert.h" />
|
||||
<ClInclude Include="ccShader_Position_uColor_frag.h" />
|
||||
<ClInclude Include="ccShader_Position_uColor_vert.h" />
|
||||
<ClInclude Include="CCSprite.h" />
|
||||
<ClInclude Include="CCSpriteBatchNode.h" />
|
||||
<ClInclude Include="CCSpriteFrame.h" />
|
||||
|
|
@ -539,6 +530,25 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<None Include="..\math\Vector2.inl" />
|
||||
<None Include="..\math\Vector3.inl" />
|
||||
<None Include="..\math\Vector4.inl" />
|
||||
<None Include="..\renderer\ccShader_Label.vert" />
|
||||
<None Include="..\renderer\ccShader_Label_df.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_df_glow.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_normal.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_outline.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColor.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.vert" />
|
||||
<None Include="..\renderer\ccShader_Position_uColor.frag" />
|
||||
<None Include="..\renderer\ccShader_Position_uColor.vert" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
|
|
|||
|
|
@ -61,9 +61,6 @@
|
|||
<Filter Include="script_support">
|
||||
<UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="shaders">
|
||||
<UniqueIdentifier>{163895ae-8a8e-46bf-bdf2-98bb2c1347fc}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="draw_nodes">
|
||||
<UniqueIdentifier>{1179d205-d065-49f0-8457-bc4c3f1d0cb3}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -103,6 +100,9 @@
|
|||
<Filter Include="math">
|
||||
<UniqueIdentifier>{02a21a86-8f65-441b-ae13-11dec1c45ee5}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="ConvertUTF">
|
||||
<UniqueIdentifier>{6c1e4a6b-c168-436b-aa63-0af7f4caebf9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
|
||||
|
|
@ -291,18 +291,6 @@
|
|||
<ClCompile Include="..\base\s3tc.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCGLProgram.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ccGLStateCache.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCShaderCache.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ccShaders.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCSpriteBatchNode.cpp">
|
||||
<Filter>sprite_nodes</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -418,7 +406,6 @@
|
|||
<ClCompile Include="platform\CCImage.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCTweenFunction.cpp" />
|
||||
<ClCompile Include="..\..\external\xxhash\xxhash.c">
|
||||
<Filter>xxhash</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -576,6 +563,33 @@
|
|||
<ClCompile Include="..\base\CCEventListenerFocus.cpp">
|
||||
<Filter>base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgramStateCache.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgram.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgramState.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\ccGLStateCache.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\ccShaders.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgramCache.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c">
|
||||
<Filter>ConvertUTF</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp">
|
||||
<Filter>ConvertUTF</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCTweenFunction.cpp">
|
||||
<Filter>actions</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h">
|
||||
|
|
@ -785,66 +799,6 @@
|
|||
<ClInclude Include="..\base\s3tc.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_Position_uColor_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_Position_uColor_vert.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionColor_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionColor_vert.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionColorLengthTexture_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionColorLengthTexture_vert.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTexture_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTexture_uColor_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTexture_uColor_vert.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTexture_vert.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTextureA8Color_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTextureA8Color_vert.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTextureColor_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTextureColor_vert.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShader_PositionTextureColorAlphaTest_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCGLProgram.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccGLStateCache.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCShaderCache.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShaderEx_SwitchMask_frag.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShaders.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCSpriteBatchNode.h">
|
||||
<Filter>sprite_nodes</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -969,7 +923,6 @@
|
|||
<ClInclude Include="platform\desktop\CCGLView.h">
|
||||
<Filter>platform\desktop</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCTweenFunction.h" />
|
||||
<ClInclude Include="..\..\external\xxhash\xxhash.h">
|
||||
<Filter>xxhash</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1166,6 +1119,30 @@
|
|||
<ClInclude Include="..\base\CCEventListenerFocus.h">
|
||||
<Filter>base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgramStateCache.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgram.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgramState.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\ccGLStateCache.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\ccShaders.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgramCache.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h">
|
||||
<Filter>ConvertUTF</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCTweenFunction.h">
|
||||
<Filter>actions</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\math\CMakeLists.txt">
|
||||
|
|
@ -1194,5 +1171,62 @@
|
|||
<None Include="..\math\Vector4.inl">
|
||||
<Filter>math</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_df.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_df_glow.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_normal.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_outline.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Position_uColor.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Position_uColor.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColor.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColor.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.frag">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.vert">
|
||||
<Filter>renderer\shaders</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
<PropertyGroup />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\2d\platform\win32;$(EngineRoot)cocos\2d\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\win32;$(EngineRoot)cocos\2d\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
|
|
|
|||
|
|
@ -136,12 +136,13 @@
|
|||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -156,12 +157,13 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINRT;NDEBUG;_LIB;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -176,12 +178,13 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -196,12 +199,13 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINRT;NDEBUG;_LIB;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -216,12 +220,13 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINRT;_DEBUG;_LIB;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -236,12 +241,13 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\winrt;$(EngineRoot)external\jpeg\include\winrt;$(EngineRoot)external\tiff\include\winrt;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\winrt;$(EngineRoot)external\winrt-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WINRT;NDEBUG;_LIB;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DisableSpecificWarnings>4267;4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
|
@ -258,218 +264,94 @@
|
|||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c">
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp" />
|
||||
<ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp" />
|
||||
<ClCompile Include="..\..\external\tinyxml2\tinyxml2.cpp" />
|
||||
<ClCompile Include="..\..\external\unzip\ioapi.cpp" />
|
||||
<ClCompile Include="..\..\external\unzip\unzip.cpp" />
|
||||
<ClCompile Include="..\..\external\xxhash\xxhash.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\base\atitc.cpp" />
|
||||
<ClCompile Include="..\base\CCAffineTransform.cpp" />
|
||||
<ClCompile Include="..\base\base64.cpp" />
|
||||
<ClCompile Include="..\base\CCAutoreleasePool.cpp" />
|
||||
<ClCompile Include="..\base\CCConfiguration.cpp" />
|
||||
<ClCompile Include="..\base\CCConsole.cpp" />
|
||||
<ClCompile Include="..\base\CCData.cpp" />
|
||||
<ClCompile Include="..\base\CCDataVisitor.cpp" />
|
||||
<ClCompile Include="..\base\CCGeometry.cpp" />
|
||||
<ClCompile Include="..\base\CCDirector.cpp" />
|
||||
<ClCompile Include="..\base\CCEvent.cpp" />
|
||||
<ClCompile Include="..\base\CCEventAcceleration.cpp" />
|
||||
<ClCompile Include="..\base\CCEventCustom.cpp" />
|
||||
<ClCompile Include="..\base\CCEventDispatcher.cpp" />
|
||||
<ClCompile Include="..\base\CCEventFocus.cpp" />
|
||||
<ClCompile Include="..\base\CCEventKeyboard.cpp" />
|
||||
<ClCompile Include="..\base\CCEventListener.cpp" />
|
||||
<ClCompile Include="..\base\CCEventListenerAcceleration.cpp" />
|
||||
<ClCompile Include="..\base\CCEventListenerCustom.cpp" />
|
||||
<ClCompile Include="..\base\CCEventListenerFocus.cpp" />
|
||||
<ClCompile Include="..\base\CCEventListenerKeyboard.cpp" />
|
||||
<ClCompile Include="..\base\CCEventListenerMouse.cpp" />
|
||||
<ClCompile Include="..\base\CCEventListenerTouch.cpp" />
|
||||
<ClCompile Include="..\base\CCEventMouse.cpp" />
|
||||
<ClCompile Include="..\base\CCEventTouch.cpp" />
|
||||
<ClCompile Include="..\base\CCNS.cpp" />
|
||||
<ClCompile Include="..\base\CCProfiling.cpp" />
|
||||
<ClCompile Include="..\base\CCRef.cpp" />
|
||||
<ClCompile Include="..\base\CCScheduler.cpp" />
|
||||
<ClCompile Include="..\base\CCTouch.cpp" />
|
||||
<ClCompile Include="..\base\ccTypes.cpp" />
|
||||
<ClCompile Include="..\base\CCValue.cpp" />
|
||||
<ClCompile Include="..\base\etc1.cpp" />
|
||||
<ClCompile Include="..\base\s3tc.cpp" />
|
||||
<ClCompile Include="..\base\ZipUtils.cpp" />
|
||||
<ClCompile Include="..\cocos2d.cpp" />
|
||||
<ClCompile Include="..\deprecated\CCArray.cpp" />
|
||||
<ClCompile Include="..\deprecated\CCDeprecated.cpp" />
|
||||
<ClCompile Include="..\deprecated\CCDictionary.cpp" />
|
||||
<ClCompile Include="..\deprecated\CCNotificationCenter.cpp" />
|
||||
<ClCompile Include="..\deprecated\CCSet.cpp" />
|
||||
<ClCompile Include="..\deprecated\CCString.cpp" />
|
||||
<ClCompile Include="..\math\kazmath\kazmath\aabb.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\GL\mat4stack.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\GL\matrix.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\mat3.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\mat4.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\neon_matrix_impl.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\plane.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\quaternion.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\ray2.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\ray3.c">
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\utility.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\vec2.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\vec3.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\kazmath\kazmath\vec4.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\math\CCAffineTransform.cpp" />
|
||||
<ClCompile Include="..\math\CCGeometry.cpp" />
|
||||
<ClCompile Include="..\math\MathUtil.cpp" />
|
||||
<ClCompile Include="..\math\Matrix.cpp" />
|
||||
<ClCompile Include="..\math\Quaternion.cpp" />
|
||||
<ClCompile Include="..\math\TransformUtils.cpp" />
|
||||
<ClCompile Include="..\math\Vector2.cpp" />
|
||||
<ClCompile Include="..\math\Vector3.cpp" />
|
||||
<ClCompile Include="..\math\Vector4.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsBody.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsContact.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
|
||||
|
|
@ -480,7 +362,18 @@
|
|||
<ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="base64.cpp" />
|
||||
<ClCompile Include="..\renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgram.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramCache.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramState.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\ccGLStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGroupCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCQuadCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderer.cpp" />
|
||||
<ClCompile Include="..\renderer\ccShaders.cpp" />
|
||||
<ClCompile Include="CCAction.cpp" />
|
||||
<ClCompile Include="CCActionCamera.cpp" />
|
||||
<ClCompile Include="CCActionCatmullRom.cpp" />
|
||||
|
|
@ -501,23 +394,8 @@
|
|||
<ClCompile Include="CCClippingNode.cpp" />
|
||||
<ClCompile Include="CCComponent.cpp" />
|
||||
<ClCompile Include="CCComponentContainer.cpp" />
|
||||
<ClCompile Include="CCConfiguration.cpp" />
|
||||
<ClCompile Include="CCDirector.cpp" />
|
||||
<ClCompile Include="CCDrawingPrimitives.cpp" />
|
||||
<ClCompile Include="CCDrawNode.cpp" />
|
||||
<ClCompile Include="CCEvent.cpp" />
|
||||
<ClCompile Include="CCEventAcceleration.cpp" />
|
||||
<ClCompile Include="CCEventCustom.cpp" />
|
||||
<ClCompile Include="CCEventDispatcher.cpp" />
|
||||
<ClCompile Include="CCEventKeyboard.cpp" />
|
||||
<ClCompile Include="CCEventListener.cpp" />
|
||||
<ClCompile Include="CCEventListenerAcceleration.cpp" />
|
||||
<ClCompile Include="CCEventListenerCustom.cpp" />
|
||||
<ClCompile Include="CCEventListenerKeyboard.cpp" />
|
||||
<ClCompile Include="CCEventListenerMouse.cpp" />
|
||||
<ClCompile Include="CCEventListenerTouch.cpp" />
|
||||
<ClCompile Include="CCEventMouse.cpp" />
|
||||
<ClCompile Include="CCEventTouch.cpp" />
|
||||
<ClCompile Include="CCFont.cpp" />
|
||||
<ClCompile Include="CCFontAtlas.cpp" />
|
||||
<ClCompile Include="CCFontAtlasCache.cpp" />
|
||||
|
|
@ -531,9 +409,25 @@
|
|||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCGLProgram.cpp" />
|
||||
<ClCompile Include="ccGLStateCache.cpp" />
|
||||
<ClCompile Include="CCGrabber.cpp" />
|
||||
<ClCompile Include="CCGrid.cpp" />
|
||||
<ClCompile Include="CCNodeGrid.cpp" />
|
||||
|
|
@ -553,14 +447,10 @@
|
|||
<ClCompile Include="CCParticleExamples.cpp" />
|
||||
<ClCompile Include="CCParticleSystem.cpp" />
|
||||
<ClCompile Include="CCParticleSystemQuad.cpp" />
|
||||
<ClCompile Include="CCProfiling.cpp" />
|
||||
<ClCompile Include="CCProgressTimer.cpp" />
|
||||
<ClCompile Include="CCRenderTexture.cpp" />
|
||||
<ClCompile Include="CCScene.cpp" />
|
||||
<ClCompile Include="CCScheduler.cpp" />
|
||||
<ClCompile Include="CCScriptSupport.cpp" />
|
||||
<ClCompile Include="CCShaderCache.cpp" />
|
||||
<ClCompile Include="ccShaders.cpp" />
|
||||
<ClCompile Include="CCSprite.cpp" />
|
||||
<ClCompile Include="CCSpriteBatchNode.cpp" />
|
||||
<ClCompile Include="CCSpriteFrame.cpp" />
|
||||
|
|
@ -574,17 +464,14 @@
|
|||
<ClCompile Include="CCTMXObjectGroup.cpp" />
|
||||
<ClCompile Include="CCTMXTiledMap.cpp" />
|
||||
<ClCompile Include="CCTMXXMLParser.cpp" />
|
||||
<ClCompile Include="CCTouch.cpp" />
|
||||
<ClCompile Include="CCTransition.cpp" />
|
||||
<ClCompile Include="CCTransitionPageTurn.cpp" />
|
||||
<ClCompile Include="CCTransitionProgress.cpp" />
|
||||
<ClCompile Include="ccTypes.cpp" />
|
||||
<ClCompile Include="CCTweenFunction.cpp" />
|
||||
<ClCompile Include="CCUserDefault.cpp" />
|
||||
<ClCompile Include="ccUTF8.cpp" />
|
||||
<ClCompile Include="ccUtils.cpp" />
|
||||
<ClCompile Include="CCVertex.cpp" />
|
||||
<ClCompile Include="cocos2d.cpp" />
|
||||
<ClCompile Include="platform\CCGLViewProtocol.cpp" />
|
||||
<ClCompile Include="platform\CCFileUtils.cpp" />
|
||||
<ClCompile Include="platform\CCImage.cpp" />
|
||||
|
|
@ -601,41 +488,67 @@
|
|||
<ClCompile Include="platform\winrt\CCStdC.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCWinRTUtils.cpp" />
|
||||
<ClCompile Include="platform\winrt\DirectXBase.cpp" />
|
||||
<ClCompile Include="platform\winrt\InputEvent.cpp" />
|
||||
<ClCompile Include="platform\winrt\pch.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="platform\winrt\sha1.cpp" />
|
||||
<ClCompile Include="renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="renderer\CCFrustum.cpp" />
|
||||
<ClCompile Include="renderer\CCGroupCommand.cpp" />
|
||||
<ClCompile Include="renderer\CCMaterialManager.cpp" />
|
||||
<ClCompile Include="renderer\CCQuadCommand.cpp" />
|
||||
<ClCompile Include="renderer\CCRenderCommand.cpp" />
|
||||
<ClCompile Include="renderer\CCRenderer.cpp" />
|
||||
<ClCompile Include="renderer\CCRenderMaterial.cpp" />
|
||||
<ClCompile Include="TGAlib.cpp" />
|
||||
<ClCompile Include="TransformUtils.cpp" />
|
||||
<ClCompile Include="ZipUtils.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
|
||||
<ClInclude Include="..\..\external\edtaa3func\edtaa3func.h" />
|
||||
<ClInclude Include="..\..\external\tinyxml2\tinyxml2.h" />
|
||||
<ClInclude Include="..\..\external\unzip\ioapi.h" />
|
||||
<ClInclude Include="..\..\external\unzip\unzip.h" />
|
||||
<ClInclude Include="..\..\external\xxhash\xxhash.h" />
|
||||
<ClInclude Include="..\base\atitc.h" />
|
||||
<ClInclude Include="..\base\CCAffineTransform.h" />
|
||||
<ClInclude Include="..\base\base64.h" />
|
||||
<ClInclude Include="..\base\CCAutoreleasePool.h" />
|
||||
<ClInclude Include="..\base\ccConfig.h" />
|
||||
<ClInclude Include="..\base\CCConfiguration.h" />
|
||||
<ClInclude Include="..\base\CCConsole.h" />
|
||||
<ClInclude Include="..\base\CCData.h" />
|
||||
<ClInclude Include="..\base\CCDataVisitor.h" />
|
||||
<ClInclude Include="..\base\CCGeometry.h" />
|
||||
<ClInclude Include="..\base\CCDirector.h" />
|
||||
<ClInclude Include="..\base\CCEvent.h" />
|
||||
<ClInclude Include="..\base\CCEventAcceleration.h" />
|
||||
<ClInclude Include="..\base\CCEventCustom.h" />
|
||||
<ClInclude Include="..\base\CCEventDispatcher.h" />
|
||||
<ClInclude Include="..\base\CCEventFocus.h" />
|
||||
<ClInclude Include="..\base\CCEventKeyboard.h" />
|
||||
<ClInclude Include="..\base\CCEventListener.h" />
|
||||
<ClInclude Include="..\base\CCEventListenerAcceleration.h" />
|
||||
<ClInclude Include="..\base\CCEventListenerCustom.h" />
|
||||
<ClInclude Include="..\base\CCEventListenerFocus.h" />
|
||||
<ClInclude Include="..\base\CCEventListenerKeyboard.h" />
|
||||
<ClInclude Include="..\base\CCEventListenerMouse.h" />
|
||||
<ClInclude Include="..\base\CCEventListenerTouch.h" />
|
||||
<ClInclude Include="..\base\CCEventMouse.h" />
|
||||
<ClInclude Include="..\base\CCEventTouch.h" />
|
||||
<ClInclude Include="..\base\CCEventType.h" />
|
||||
<ClInclude Include="..\base\ccMacros.h" />
|
||||
<ClInclude Include="..\base\CCMap.h" />
|
||||
<ClInclude Include="..\base\CCNS.h" />
|
||||
<ClInclude Include="..\base\CCProfiling.h" />
|
||||
<ClInclude Include="..\base\CCRef.h" />
|
||||
<ClInclude Include="..\base\CCPlatformConfig.h" />
|
||||
<ClInclude Include="..\base\CCPlatformMacros.h" />
|
||||
<ClInclude Include="..\base\CCRefPtr.h" />
|
||||
<ClInclude Include="..\base\CCScheduler.h" />
|
||||
<ClInclude Include="..\base\CCTouch.h" />
|
||||
<ClInclude Include="..\base\ccTypes.h" />
|
||||
<ClInclude Include="..\base\CCValue.h" />
|
||||
<ClInclude Include="..\base\CCVector.h" />
|
||||
<ClInclude Include="..\base\etc1.h" />
|
||||
<ClInclude Include="..\base\s3tc.h" />
|
||||
<ClInclude Include="..\base\ZipUtils.h" />
|
||||
<ClInclude Include="..\cocos2d.h" />
|
||||
<ClInclude Include="..\deprecated\CCArray.h" />
|
||||
<ClInclude Include="..\deprecated\CCBool.h" />
|
||||
<ClInclude Include="..\deprecated\CCDeprecated.h" />
|
||||
|
|
@ -646,21 +559,17 @@
|
|||
<ClInclude Include="..\deprecated\CCNotificationCenter.h" />
|
||||
<ClInclude Include="..\deprecated\CCSet.h" />
|
||||
<ClInclude Include="..\deprecated\CCString.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\aabb.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\GL\mat4stack.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\GL\matrix.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\kazmath.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\mat3.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\mat4.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\neon_matrix_impl.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\plane.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\quaternion.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\ray2.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\ray3.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\utility.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\vec2.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\vec3.h" />
|
||||
<ClInclude Include="..\math\kazmath\kazmath\vec4.h" />
|
||||
<ClInclude Include="..\math\CCAffineTransform.h" />
|
||||
<ClInclude Include="..\math\CCGeometry.h" />
|
||||
<ClInclude Include="..\math\CCMath.h" />
|
||||
<ClInclude Include="..\math\CCMathBase.h" />
|
||||
<ClInclude Include="..\math\MathUtil.h" />
|
||||
<ClInclude Include="..\math\Matrix.h" />
|
||||
<ClInclude Include="..\math\Quaternion.h" />
|
||||
<ClInclude Include="..\math\TransformUtils.h" />
|
||||
<ClInclude Include="..\math\Vector2.h" />
|
||||
<ClInclude Include="..\math\Vector3.h" />
|
||||
<ClInclude Include="..\math\Vector4.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsContact.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsJoint.h" />
|
||||
|
|
@ -672,7 +581,19 @@
|
|||
<ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
|
||||
<ClInclude Include="base64.h" />
|
||||
<ClInclude Include="..\renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgram.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramCache.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramState.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramStateCache.h" />
|
||||
<ClInclude Include="..\renderer\ccGLStateCache.h" />
|
||||
<ClInclude Include="..\renderer\CCGroupCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCQuadCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommandPool.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderer.h" />
|
||||
<ClInclude Include="..\renderer\ccShaders.h" />
|
||||
<ClInclude Include="CCAction.h" />
|
||||
<ClInclude Include="CCActionCamera.h" />
|
||||
<ClInclude Include="CCActionCatmullRom.h" />
|
||||
|
|
@ -694,24 +615,9 @@
|
|||
<ClInclude Include="CCComponent.h" />
|
||||
<ClInclude Include="CCComponentContainer.h" />
|
||||
<ClInclude Include="ccConfig.h" />
|
||||
<ClInclude Include="CCConfiguration.h" />
|
||||
<ClInclude Include="CCDeprecated.h" />
|
||||
<ClInclude Include="CCDirector.h" />
|
||||
<ClInclude Include="CCDrawingPrimitives.h" />
|
||||
<ClInclude Include="CCDrawNode.h" />
|
||||
<ClInclude Include="CCEvent.h" />
|
||||
<ClInclude Include="CCEventAcceleration.h" />
|
||||
<ClInclude Include="CCEventCustom.h" />
|
||||
<ClInclude Include="CCEventDispatcher.h" />
|
||||
<ClInclude Include="CCEventKeyboard.h" />
|
||||
<ClInclude Include="CCEventListener.h" />
|
||||
<ClInclude Include="CCEventListenerAcceleration.h" />
|
||||
<ClInclude Include="CCEventListenerCustom.h" />
|
||||
<ClInclude Include="CCEventListenerKeyboard.h" />
|
||||
<ClInclude Include="CCEventListenerMouse.h" />
|
||||
<ClInclude Include="CCEventListenerTouch.h" />
|
||||
<ClInclude Include="CCEventMouse.h" />
|
||||
<ClInclude Include="CCEventTouch.h" />
|
||||
<ClInclude Include="CCEventType.h" />
|
||||
<ClInclude Include="CCFont.h" />
|
||||
<ClInclude Include="CCFontAtlas.h" />
|
||||
|
|
@ -720,8 +626,6 @@
|
|||
<ClInclude Include="CCFontFNT.h" />
|
||||
<ClInclude Include="CCFontFreeType.h" />
|
||||
<ClInclude Include="ccFPSImages.h" />
|
||||
<ClInclude Include="CCGLProgram.h" />
|
||||
<ClInclude Include="ccGLStateCache.h" />
|
||||
<ClInclude Include="CCGrabber.h" />
|
||||
<ClInclude Include="CCGrid.h" />
|
||||
<ClInclude Include="CCNodeGrid.h" />
|
||||
|
|
@ -743,31 +647,11 @@
|
|||
<ClInclude Include="CCParticleExamples.h" />
|
||||
<ClInclude Include="CCParticleSystem.h" />
|
||||
<ClInclude Include="CCParticleSystemQuad.h" />
|
||||
<ClInclude Include="CCProfiling.h" />
|
||||
<ClInclude Include="CCProgressTimer.h" />
|
||||
<ClInclude Include="CCProtocols.h" />
|
||||
<ClInclude Include="CCRenderTexture.h" />
|
||||
<ClInclude Include="CCScene.h" />
|
||||
<ClInclude Include="CCScheduler.h" />
|
||||
<ClInclude Include="CCScriptSupport.h" />
|
||||
<ClInclude Include="CCShaderCache.h" />
|
||||
<ClInclude Include="ccShaderEx_SwitchMask_frag.h" />
|
||||
<ClInclude Include="ccShaders.h" />
|
||||
<ClInclude Include="ccShader_PositionColorLengthTexture_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionColorLengthTexture_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionColor_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionColor_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureA8Color_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureA8Color_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureColorAlphaTest_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureColor_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTextureColor_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_uColor_frag.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_uColor_vert.h" />
|
||||
<ClInclude Include="ccShader_PositionTexture_vert.h" />
|
||||
<ClInclude Include="ccShader_Position_uColor_frag.h" />
|
||||
<ClInclude Include="ccShader_Position_uColor_vert.h" />
|
||||
<ClInclude Include="CCSprite.h" />
|
||||
<ClInclude Include="CCSpriteBatchNode.h" />
|
||||
<ClInclude Include="CCSpriteFrame.h" />
|
||||
|
|
@ -781,7 +665,6 @@
|
|||
<ClInclude Include="CCTMXObjectGroup.h" />
|
||||
<ClInclude Include="CCTMXTiledMap.h" />
|
||||
<ClInclude Include="CCTMXXMLParser.h" />
|
||||
<ClInclude Include="CCTouch.h" />
|
||||
<ClInclude Include="CCTransition.h" />
|
||||
<ClInclude Include="CCTransitionPageTurn.h" />
|
||||
<ClInclude Include="CCTransitionProgress.h" />
|
||||
|
|
@ -813,21 +696,46 @@
|
|||
<ClInclude Include="platform\winrt\CCWinRTUtils.h" />
|
||||
<ClInclude Include="platform\winrt\DirectXBase.h" />
|
||||
<ClInclude Include="platform\winrt\DirectXHelper.h" />
|
||||
<ClInclude Include="platform\winrt\InputEvent.h" />
|
||||
<ClInclude Include="platform\winrt\InputEventTypes.h" />
|
||||
<ClInclude Include="platform\winrt\pch.h" />
|
||||
<ClInclude Include="platform\winrt\sha1.h" />
|
||||
<ClInclude Include="renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="renderer\CCFrustum.h" />
|
||||
<ClInclude Include="renderer\CCGroupCommand.h" />
|
||||
<ClInclude Include="renderer\CCMaterialManager.h" />
|
||||
<ClInclude Include="renderer\CCQuadCommand.h" />
|
||||
<ClInclude Include="renderer\CCRenderCommand.h" />
|
||||
<ClInclude Include="renderer\CCRenderCommandPool.h" />
|
||||
<ClInclude Include="renderer\CCRenderer.h" />
|
||||
<ClInclude Include="renderer\CCRenderMaterial.h" />
|
||||
<ClInclude Include="TGAlib.h" />
|
||||
<ClInclude Include="TransformUtils.h" />
|
||||
<ClInclude Include="uthash.h" />
|
||||
<ClInclude Include="utlist.h" />
|
||||
<ClInclude Include="ZipUtils.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\math\CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\math\MathUtil.inl" />
|
||||
<None Include="..\math\MathUtilNeon.inl" />
|
||||
<None Include="..\math\Matrix.inl" />
|
||||
<None Include="..\math\Quaternion.inl" />
|
||||
<None Include="..\math\Vector2.inl" />
|
||||
<None Include="..\math\Vector3.inl" />
|
||||
<None Include="..\math\Vector4.inl" />
|
||||
<None Include="..\renderer\ccShader_Label.vert" />
|
||||
<None Include="..\renderer\ccShader_Label_df.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_df_glow.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_normal.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_outline.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColor.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColorAlphaTest.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor_noMVP.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor_noMVP.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.vert" />
|
||||
<None Include="..\renderer\ccShader_Position_uColor.frag" />
|
||||
<None Include="..\renderer\ccShader_Position_uColor.vert" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -7,7 +7,7 @@
|
|||
<PropertyGroup />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)cocos\math\kazmath\include;$(GeneratedFilesDir)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)cocos\math\kazmath\include;$(GeneratedFilesDir);$(EngineRoot)external\ConvertUTF;</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -188,6 +188,19 @@
|
|||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp" />
|
||||
<ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp" />
|
||||
<ClCompile Include="..\..\external\tinyxml2\tinyxml2.cpp" />
|
||||
<ClCompile Include="..\..\external\unzip\ioapi.cpp" />
|
||||
|
|
@ -270,10 +283,16 @@
|
|||
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgram.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramCache.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramState.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgramStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\ccGLStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGroupCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCQuadCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderer.cpp" />
|
||||
<ClCompile Include="..\renderer\ccShaders.cpp" />
|
||||
<ClCompile Include="CCAction.cpp" />
|
||||
<ClCompile Include="CCActionCamera.cpp" />
|
||||
<ClCompile Include="CCActionCatmullRom.cpp" />
|
||||
|
|
@ -320,8 +339,6 @@
|
|||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCGLProgram.cpp" />
|
||||
<ClCompile Include="ccGLStateCache.cpp" />
|
||||
<ClCompile Include="CCGrabber.cpp" />
|
||||
<ClCompile Include="CCGrid.cpp" />
|
||||
<ClCompile Include="CCNodeGrid.cpp" />
|
||||
|
|
@ -345,8 +362,6 @@
|
|||
<ClCompile Include="CCRenderTexture.cpp" />
|
||||
<ClCompile Include="CCScene.cpp" />
|
||||
<ClCompile Include="CCScriptSupport.cpp" />
|
||||
<ClCompile Include="CCShaderCache.cpp" />
|
||||
<ClCompile Include="ccShaders.cpp" />
|
||||
<ClCompile Include="CCSprite.cpp" />
|
||||
<ClCompile Include="CCSpriteBatchNode.cpp" />
|
||||
<ClCompile Include="CCSpriteFrame.cpp" />
|
||||
|
|
@ -414,6 +429,7 @@
|
|||
<ClCompile Include="TGAlib.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
|
||||
<ClInclude Include="..\..\external\edtaa3func\edtaa3func.h" />
|
||||
<ClInclude Include="..\..\external\tinyxml2\tinyxml2.h" />
|
||||
<ClInclude Include="..\..\external\unzip\ioapi.h" />
|
||||
|
|
@ -494,11 +510,17 @@
|
|||
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
|
||||
<ClInclude Include="..\renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgram.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramCache.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramState.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgramStateCache.h" />
|
||||
<ClInclude Include="..\renderer\ccGLStateCache.h" />
|
||||
<ClInclude Include="..\renderer\CCGroupCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCQuadCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommandPool.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderer.h" />
|
||||
<ClInclude Include="..\renderer\ccShaders.h" />
|
||||
<ClInclude Include="CCAction.h" />
|
||||
<ClInclude Include="CCActionCamera.h" />
|
||||
<ClInclude Include="CCActionCatmullRom.h" />
|
||||
|
|
@ -530,8 +552,6 @@
|
|||
<ClInclude Include="CCFontFNT.h" />
|
||||
<ClInclude Include="CCFontFreeType.h" />
|
||||
<ClInclude Include="ccFPSImages.h" />
|
||||
<ClInclude Include="CCGLProgram.h" />
|
||||
<ClInclude Include="ccGLStateCache.h" />
|
||||
<ClInclude Include="CCGrabber.h" />
|
||||
<ClInclude Include="CCGrid.h" />
|
||||
<ClInclude Include="CCNodeGrid.h" />
|
||||
|
|
@ -558,8 +578,6 @@
|
|||
<ClInclude Include="CCRenderTexture.h" />
|
||||
<ClInclude Include="CCScene.h" />
|
||||
<ClInclude Include="CCScriptSupport.h" />
|
||||
<ClInclude Include="CCShaderCache.h" />
|
||||
<ClInclude Include="ccShaders.h" />
|
||||
<ClInclude Include="CCSprite.h" />
|
||||
<ClInclude Include="CCSpriteBatchNode.h" />
|
||||
<ClInclude Include="CCSpriteFrame.h" />
|
||||
|
|
@ -619,6 +637,28 @@
|
|||
<None Include="..\math\Vector2.inl" />
|
||||
<None Include="..\math\Vector3.inl" />
|
||||
<None Include="..\math\Vector4.inl" />
|
||||
<None Include="..\renderer\ccShader_Label.vert" />
|
||||
<None Include="..\renderer\ccShader_Label_df.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_df_glow.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_normal.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_outline.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColor.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColorAlphaTest.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor_noMVP.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor_noMVP.vert" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.frag" />
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.vert" />
|
||||
<None Include="..\renderer\ccShader_Position_uColor.frag" />
|
||||
<None Include="..\renderer\ccShader_Position_uColor.vert" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\base\CMakeLists.txt" />
|
||||
|
|
|
|||
|
|
@ -58,9 +58,6 @@
|
|||
<Filter Include="script_support">
|
||||
<UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="shaders">
|
||||
<UniqueIdentifier>{163895ae-8a8e-46bf-bdf2-98bb2c1347fc}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="draw_nodes">
|
||||
<UniqueIdentifier>{1179d205-d065-49f0-8457-bc4c3f1d0cb3}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -103,6 +100,12 @@
|
|||
<Filter Include="math">
|
||||
<UniqueIdentifier>{9bbf7050-757b-41b1-ab15-418db52c2023}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="renderer\Shaders">
|
||||
<UniqueIdentifier>{3237780d-1154-4049-bf53-151c421f26e9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="ConvertUTF">
|
||||
<UniqueIdentifier>{026f880b-7918-49f8-8f0d-00f7593ce326}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
|
||||
|
|
@ -276,18 +279,6 @@
|
|||
<ClCompile Include="..\base\s3tc.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCGLProgram.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ccGLStateCache.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCShaderCache.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ccShaders.cpp">
|
||||
<Filter>shaders</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCSpriteBatchNode.cpp">
|
||||
<Filter>sprite_nodes</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -600,6 +591,30 @@
|
|||
<ClCompile Include="..\base\CCEventListenerFocus.cpp">
|
||||
<Filter>base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgram.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgramState.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgramStateCache.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\ccGLStateCache.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\ccShaders.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCGLProgramCache.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c">
|
||||
<Filter>ConvertUTF</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp">
|
||||
<Filter>ConvertUTF</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h">
|
||||
|
|
@ -809,18 +824,6 @@
|
|||
<ClInclude Include="..\base\s3tc.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCGLProgram.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccGLStateCache.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCShaderCache.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ccShaders.h">
|
||||
<Filter>shaders</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCSpriteBatchNode.h">
|
||||
<Filter>sprite_nodes</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1186,6 +1189,27 @@
|
|||
<ClInclude Include="..\base\CCEventListenerFocus.h">
|
||||
<Filter>base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgram.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgramState.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgramStateCache.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\ccGLStateCache.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\ccShaders.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\renderer\CCGLProgramCache.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h">
|
||||
<Filter>ConvertUTF</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\math\MathUtil.inl">
|
||||
|
|
@ -1209,6 +1233,72 @@
|
|||
<None Include="..\math\Vector4.inl">
|
||||
<Filter>math</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_df.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_df_glow.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_normal.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Label_outline.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Position_uColor.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_Position_uColor.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColor.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColor.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionColorLengthTexture.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTexture_uColor.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureA8Color.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor_noMVP.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureColor_noMVP.vert">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
<None Include="..\renderer\ccShader_PositionTextureColorAlphaTest.frag">
|
||||
<Filter>renderer\Shaders</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\base\CMakeLists.txt">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<PropertyGroup />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)cocos\2d\platform\wp8;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\ui;$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)cocos\math\kazmath\include;$(EngineRoot)cocos\deprecated;$(GeneratedFilesDir)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)cocos\2d\platform\wp8;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\ui;$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)cocos\math\kazmath\include;$(EngineRoot)cocos\deprecated;$(EngineRoot)external\ConvertUTF;$(GeneratedFilesDir)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<CompileAsWinRT>true</CompileAsWinRT>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
|
|||
$(LOCAL_PATH)/../../.. \
|
||||
$(LOCAL_PATH)/../../../base \
|
||||
$(LOCAL_PATH)/../../../math \
|
||||
$(LOCAL_PATH)/../../../physics
|
||||
$(LOCAL_PATH)/../../../physics \
|
||||
$(LOCAL_PATH)/../../../renderer
|
||||
|
||||
LOCAL_LDLIBS := -lGLESv1_CM \
|
||||
-lGLESv2 \
|
||||
|
|
|
|||
|
|
@ -683,4 +683,8 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl
|
|||
return true;
|
||||
}
|
||||
|
||||
public int getAudioSessionId () {
|
||||
// TODO Auto-generated method stub
|
||||
return mMediaPlayer.getAudioSessionId();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ THE SOFTWARE.
|
|||
#include "CCEventCustom.h"
|
||||
#include "CCEventType.h"
|
||||
#include "CCGLView.h"
|
||||
#include "CCShaderCache.h"
|
||||
#include "CCGLProgramCache.h"
|
||||
#include "CCTextureCache.h"
|
||||
#include "platform/android/jni/JniHelper.h"
|
||||
#include <android/log.h>
|
||||
|
|
@ -68,7 +68,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
|
|||
else
|
||||
{
|
||||
cocos2d::GL::invalidateStateCache();
|
||||
cocos2d::ShaderCache::getInstance()->reloadDefaultShaders();
|
||||
cocos2d::GLProgramCache::getInstance()->reloadDefaultGLPrograms();
|
||||
cocos2d::DrawPrimitives::init();
|
||||
cocos2d::VolatileTextureMgr::reloadAllTextures();
|
||||
|
||||
|
|
|
|||
|
|
@ -119,4 +119,4 @@ bool FileUtilsLinux::isFileExistInternal(const std::string& strFilePath) const
|
|||
|
||||
NS_CC_END
|
||||
|
||||
#endif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
|
||||
#endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
|
||||
|
|
|
|||
|
|
@ -271,6 +271,61 @@ void WinRTWindow::OnPointerWheelChanged(CoreWindow^ sender, PointerEventArgs^ ar
|
|||
GLView::sharedOpenGLView()->handleTouchesEnd(1, &id, &p.x, &p.y);
|
||||
}
|
||||
|
||||
// user pressed the Back Key on the phone
|
||||
void GLView::OnBackKeyPress()
|
||||
{
|
||||
#if 0
|
||||
if (m_delegate)
|
||||
{
|
||||
m_delegate->Invoke(Cocos2dEvent::TerminateApp);
|
||||
}
|
||||
#endif // 0
|
||||
|
||||
}
|
||||
|
||||
|
||||
void GLView::OnPointerPressed(PointerEventArgs^ args)
|
||||
{
|
||||
#if 0
|
||||
int id = args->CurrentPoint->PointerId;
|
||||
Vector2 pt = GetPoint(args);
|
||||
handleTouchesBegin(1, &id, &pt.x, &pt.y);
|
||||
#endif
|
||||
}
|
||||
|
||||
void GLView::OnPointerMoved(PointerEventArgs^ args)
|
||||
{
|
||||
#if 0
|
||||
auto currentPoint = args->CurrentPoint;
|
||||
if (currentPoint->IsInContact)
|
||||
{
|
||||
if (m_lastPointValid)
|
||||
{
|
||||
int id = args->CurrentPoint->PointerId;
|
||||
Vector2 p = GetPoint(args);
|
||||
handleTouchesMove(1, &id, &p.x, &p.y);
|
||||
}
|
||||
m_lastPoint = currentPoint->Position;
|
||||
m_lastPointValid = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_lastPointValid = false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void GLView::OnPointerReleased(PointerEventArgs^ args)
|
||||
{
|
||||
#if 0
|
||||
int id = args->CurrentPoint->PointerId;
|
||||
Vector2 pt = GetPoint(args);
|
||||
handleTouchesEnd(1, &id, &pt.x, &pt.y);
|
||||
#endif // 0
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
void WinRTWindow::OnPointerPressed(CoreWindow^ sender, PointerEventArgs^ args)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ THE SOFTWARE.
|
|||
#include "CCGL.h"
|
||||
#include "platform/CCCommon.h"
|
||||
#include "InputEvent.h"
|
||||
#include "CCGeometry.h"
|
||||
#include "platform/CCGLViewProtocol.h"
|
||||
#include <agile.h>
|
||||
|
||||
|
|
@ -80,7 +79,7 @@ private:
|
|||
|
||||
Platform::Agile<Windows::UI::Core::CoreWindow> m_window;
|
||||
|
||||
Windows::Foundation::Vector2 m_lastPoint;
|
||||
Windows::Foundation::Point m_lastPoint;
|
||||
Windows::Foundation::EventRegistrationToken m_eventToken;
|
||||
bool m_lastPointValid;
|
||||
bool m_textInputEnabled;
|
||||
|
|
@ -114,9 +113,16 @@ public:
|
|||
void OnSuspending();
|
||||
void GLView::QueueEvent(std::shared_ptr<InputEvent>& event);
|
||||
|
||||
void OnPointerPressed(Windows::UI::Core::PointerEventArgs^ args);
|
||||
void OnPointerMoved(Windows::UI::Core::PointerEventArgs^ args);
|
||||
void OnPointerReleased(Windows::UI::Core::PointerEventArgs^ args);
|
||||
void OnPointerPressed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
|
||||
void OnBackKeyPress();
|
||||
|
||||
|
||||
private:
|
||||
Windows::Foundation::EventRegistrationToken m_eventToken;
|
||||
Windows::Foundation::Vector2 m_lastPoint;
|
||||
Windows::Foundation::Point m_lastPoint;
|
||||
bool m_lastPointValid;
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ THE SOFTWARE.
|
|||
****************************************************************************/
|
||||
#include "CCPrecompiledShaders.h"
|
||||
#include "CCWinRTUtils.h"
|
||||
#include "CCGLProgram.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "sha1.h"
|
||||
|
||||
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,9 +8,9 @@ LOCAL_MODULE_FILENAME := libcocos2d
|
|||
|
||||
LOCAL_SRC_FILES := \
|
||||
cocos2d.cpp \
|
||||
2d/CCAction.cpp \
|
||||
2d/CCActionCamera.cpp \
|
||||
2d/CCActionCatmullRom.cpp \
|
||||
2d/CCAction.cpp \
|
||||
2d/CCActionEase.cpp \
|
||||
2d/CCActionGrid3D.cpp \
|
||||
2d/CCActionGrid.cpp \
|
||||
|
|
@ -37,8 +37,6 @@ cocos2d.cpp \
|
|||
2d/CCFontFNT.cpp \
|
||||
2d/CCFontFreeType.cpp \
|
||||
2d/CCGLBufferedNode.cpp \
|
||||
2d/CCGLProgram.cpp \
|
||||
2d/ccGLStateCache.cpp \
|
||||
2d/CCGrabber.cpp \
|
||||
2d/CCGrid.cpp \
|
||||
2d/CCIMEDispatcher.cpp \
|
||||
|
|
@ -62,8 +60,6 @@ cocos2d.cpp \
|
|||
2d/CCRenderTexture.cpp \
|
||||
2d/CCScene.cpp \
|
||||
2d/CCScriptSupport.cpp \
|
||||
2d/CCShaderCache.cpp \
|
||||
2d/ccShaders.cpp \
|
||||
2d/CCSpriteBatchNode.cpp \
|
||||
2d/CCSprite.cpp \
|
||||
2d/CCSpriteFrameCache.cpp \
|
||||
|
|
@ -135,12 +131,18 @@ base/base64.cpp \
|
|||
base/ccTypes.cpp \
|
||||
base/etc1.cpp \
|
||||
base/s3tc.cpp \
|
||||
renderer/CCBatchCommand.cpp \
|
||||
renderer/CCCustomCommand.cpp \
|
||||
renderer/CCGLProgram.cpp \
|
||||
renderer/CCGLProgramState.cpp \
|
||||
renderer/CCGLProgramStateCache.cpp \
|
||||
renderer/ccGLStateCache.cpp \
|
||||
renderer/CCGroupCommand.cpp \
|
||||
renderer/CCQuadCommand.cpp \
|
||||
renderer/CCBatchCommand.cpp \
|
||||
renderer/CCRenderCommand.cpp \
|
||||
renderer/CCRenderer.cpp \
|
||||
renderer/CCGLProgramCache.cpp \
|
||||
renderer/ccShaders.cpp \
|
||||
deprecated/CCArray.cpp \
|
||||
deprecated/CCSet.cpp \
|
||||
deprecated/CCString.cpp \
|
||||
|
|
@ -157,6 +159,8 @@ physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp \
|
|||
physics/chipmunk/CCPhysicsJointInfo_chipmunk.cpp \
|
||||
physics/chipmunk/CCPhysicsShapeInfo_chipmunk.cpp \
|
||||
physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp \
|
||||
../external/ConvertUTF/ConvertUTFWrapper.cpp \
|
||||
../external/ConvertUTF/ConvertUTF.c \
|
||||
../external/tinyxml2/tinyxml2.cpp \
|
||||
../external/unzip/ioapi.cpp \
|
||||
../external/unzip/unzip.cpp \
|
||||
|
|
@ -180,7 +184,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
|
|||
$(LOCAL_PATH)/../external/unzip \
|
||||
$(LOCAL_PATH)/../external/chipmunk/include/chipmunk \
|
||||
$(LOCAL_PATH)/../external/edtaa3func \
|
||||
$(LOCAL_PATH)/../external/xxhash
|
||||
$(LOCAL_PATH)/../external/xxhash \
|
||||
$(LOCAL_PATH)/../external/ConvertUTF
|
||||
|
||||
|
||||
LOCAL_LDLIBS := -lGLESv2 \
|
||||
|
|
|
|||
|
|
@ -36,14 +36,15 @@ THE SOFTWARE.
|
|||
#include "2d/CCScene.h"
|
||||
#include "2d/CCSpriteFrameCache.h"
|
||||
#include "2d/platform/CCFileUtils.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "2d/platform/CCImage.h"
|
||||
#include "2d/CCActionManager.h"
|
||||
#include "2d/CCFontFNT.h"
|
||||
#include "2d/CCFontAtlasCache.h"
|
||||
#include "2d/CCAnimationCache.h"
|
||||
#include "2d/CCUserDefault.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "renderer/CCGLProgramCache.h"
|
||||
#include "renderer/CCGLProgramStateCache.h"
|
||||
#include "2d/CCTransition.h"
|
||||
#include "2d/CCTextureCache.h"
|
||||
#include "2d/CCFontFreeType.h"
|
||||
|
|
@ -952,7 +953,8 @@ void Director::purgeDirector()
|
|||
DrawPrimitives::free();
|
||||
AnimationCache::destroyInstance();
|
||||
SpriteFrameCache::destroyInstance();
|
||||
ShaderCache::destroyInstance();
|
||||
GLProgramCache::destroyInstance();
|
||||
GLProgramStateCache::destroyInstance();
|
||||
FileUtils::destroyInstance();
|
||||
Configuration::destroyInstance();
|
||||
|
||||
|
|
|
|||
|
|
@ -31,143 +31,108 @@ NS_CC_BEGIN
|
|||
const Value Value::Null;
|
||||
|
||||
Value::Value()
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::NONE)
|
||||
: _type(Type::NONE)
|
||||
{
|
||||
|
||||
memset(&_field, 0, sizeof(_field));
|
||||
}
|
||||
|
||||
Value::Value(unsigned char v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::BYTE)
|
||||
: _type(Type::BYTE)
|
||||
{
|
||||
_baseData.byteVal = v;
|
||||
_field.byteVal = v;
|
||||
}
|
||||
|
||||
Value::Value(int v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::INTEGER)
|
||||
: _type(Type::INTEGER)
|
||||
{
|
||||
_baseData.intVal = v;
|
||||
_field.intVal = v;
|
||||
}
|
||||
|
||||
Value::Value(float v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::FLOAT)
|
||||
: _type(Type::FLOAT)
|
||||
{
|
||||
_baseData.floatVal = v;
|
||||
_field.floatVal = v;
|
||||
}
|
||||
|
||||
Value::Value(double v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::DOUBLE)
|
||||
: _type(Type::DOUBLE)
|
||||
{
|
||||
_baseData.doubleVal = v;
|
||||
_field.doubleVal = v;
|
||||
}
|
||||
|
||||
Value::Value(bool v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::BOOLEAN)
|
||||
: _type(Type::BOOLEAN)
|
||||
{
|
||||
_baseData.boolVal = v;
|
||||
_field.boolVal = v;
|
||||
}
|
||||
|
||||
Value::Value(const char* v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::STRING)
|
||||
: _type(Type::STRING)
|
||||
{
|
||||
_strData = v;
|
||||
_field.strVal = new std::string();
|
||||
if (v)
|
||||
{
|
||||
*_field.strVal = v;
|
||||
}
|
||||
}
|
||||
|
||||
Value::Value(const std::string& v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::STRING)
|
||||
: _type(Type::STRING)
|
||||
{
|
||||
_strData = v;
|
||||
_field.strVal = new std::string();
|
||||
*_field.strVal = v;
|
||||
}
|
||||
|
||||
Value::Value(const ValueVector& v)
|
||||
: _vectorData(new ValueVector())
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::VECTOR)
|
||||
: _type(Type::VECTOR)
|
||||
{
|
||||
*_vectorData = v;
|
||||
_field.vectorVal = new ValueVector();
|
||||
*_field.vectorVal = v;
|
||||
}
|
||||
|
||||
Value::Value(ValueVector&& v)
|
||||
: _vectorData(new ValueVector())
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::VECTOR)
|
||||
: _type(Type::VECTOR)
|
||||
{
|
||||
*_vectorData = std::move(v);
|
||||
_field.vectorVal = new ValueVector();
|
||||
*_field.vectorVal = std::move(v);
|
||||
}
|
||||
|
||||
Value::Value(const ValueMap& v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(new ValueMap())
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::MAP)
|
||||
: _type(Type::MAP)
|
||||
{
|
||||
*_mapData = v;
|
||||
_field.mapVal = new ValueMap();
|
||||
*_field.mapVal = v;
|
||||
}
|
||||
|
||||
Value::Value(ValueMap&& v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(new ValueMap())
|
||||
, _intKeyMapData(nullptr)
|
||||
, _type(Type::MAP)
|
||||
: _type(Type::MAP)
|
||||
{
|
||||
*_mapData = std::move(v);
|
||||
_field.mapVal = new ValueMap();
|
||||
*_field.mapVal = std::move(v);
|
||||
}
|
||||
|
||||
Value::Value(const ValueMapIntKey& v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(new ValueMapIntKey())
|
||||
, _type(Type::INT_KEY_MAP)
|
||||
: _type(Type::INT_KEY_MAP)
|
||||
{
|
||||
*_intKeyMapData = v;
|
||||
_field.intKeyMapVal = new ValueMapIntKey();
|
||||
*_field.intKeyMapVal = v;
|
||||
}
|
||||
|
||||
Value::Value(ValueMapIntKey&& v)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(new ValueMapIntKey())
|
||||
, _type(Type::INT_KEY_MAP)
|
||||
: _type(Type::INT_KEY_MAP)
|
||||
{
|
||||
*_intKeyMapData = std::move(v);
|
||||
_field.intKeyMapVal = new ValueMapIntKey();
|
||||
*_field.intKeyMapVal = std::move(v);
|
||||
}
|
||||
|
||||
Value::Value(const Value& other)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
: _type(Type::NONE)
|
||||
{
|
||||
*this = other;
|
||||
}
|
||||
|
||||
Value::Value(Value&& other)
|
||||
: _vectorData(nullptr)
|
||||
, _mapData(nullptr)
|
||||
, _intKeyMapData(nullptr)
|
||||
: _type(Type::NONE)
|
||||
{
|
||||
*this = std::move(other);
|
||||
}
|
||||
|
|
@ -180,90 +145,99 @@ Value::~Value()
|
|||
Value& Value::operator= (const Value& other)
|
||||
{
|
||||
if (this != &other) {
|
||||
reset(other._type);
|
||||
|
||||
switch (other._type) {
|
||||
case Type::BYTE:
|
||||
_baseData.byteVal = other._baseData.byteVal;
|
||||
_field.byteVal = other._field.byteVal;
|
||||
break;
|
||||
case Type::INTEGER:
|
||||
_baseData.intVal = other._baseData.intVal;
|
||||
_field.intVal = other._field.intVal;
|
||||
break;
|
||||
case Type::FLOAT:
|
||||
_baseData.floatVal = other._baseData.floatVal;
|
||||
_field.floatVal = other._field.floatVal;
|
||||
break;
|
||||
case Type::DOUBLE:
|
||||
_baseData.doubleVal = other._baseData.doubleVal;
|
||||
_field.doubleVal = other._field.doubleVal;
|
||||
break;
|
||||
case Type::BOOLEAN:
|
||||
_baseData.boolVal = other._baseData.boolVal;
|
||||
_field.boolVal = other._field.boolVal;
|
||||
break;
|
||||
case Type::STRING:
|
||||
_strData = other._strData;
|
||||
if (_field.strVal == nullptr)
|
||||
{
|
||||
_field.strVal = new std::string();
|
||||
}
|
||||
*_field.strVal = *other._field.strVal;
|
||||
break;
|
||||
case Type::VECTOR:
|
||||
if (_vectorData == nullptr)
|
||||
_vectorData = new ValueVector();
|
||||
*_vectorData = *other._vectorData;
|
||||
if (_field.vectorVal == nullptr)
|
||||
{
|
||||
_field.vectorVal = new ValueVector();
|
||||
}
|
||||
*_field.vectorVal = *other._field.vectorVal;
|
||||
break;
|
||||
case Type::MAP:
|
||||
if (_mapData == nullptr)
|
||||
_mapData = new ValueMap();
|
||||
*_mapData = *other._mapData;
|
||||
if (_field.mapVal == nullptr)
|
||||
{
|
||||
_field.mapVal = new ValueMap();
|
||||
}
|
||||
*_field.mapVal = *other._field.mapVal;
|
||||
break;
|
||||
case Type::INT_KEY_MAP:
|
||||
if (_intKeyMapData == nullptr)
|
||||
_intKeyMapData = new ValueMapIntKey();
|
||||
*_intKeyMapData = *other._intKeyMapData;
|
||||
if (_field.intKeyMapVal == nullptr)
|
||||
{
|
||||
_field.intKeyMapVal = new ValueMapIntKey();
|
||||
}
|
||||
*_field.intKeyMapVal = *other._field.intKeyMapVal;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
_type = other._type;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (Value&& other)
|
||||
{
|
||||
if (this != &other) {
|
||||
switch (other._type) {
|
||||
if (this != &other)
|
||||
{
|
||||
clear();
|
||||
switch (other._type)
|
||||
{
|
||||
case Type::BYTE:
|
||||
_baseData.byteVal = other._baseData.byteVal;
|
||||
_field.byteVal = other._field.byteVal;
|
||||
break;
|
||||
case Type::INTEGER:
|
||||
_baseData.intVal = other._baseData.intVal;
|
||||
_field.intVal = other._field.intVal;
|
||||
break;
|
||||
case Type::FLOAT:
|
||||
_baseData.floatVal = other._baseData.floatVal;
|
||||
_field.floatVal = other._field.floatVal;
|
||||
break;
|
||||
case Type::DOUBLE:
|
||||
_baseData.doubleVal = other._baseData.doubleVal;
|
||||
_field.doubleVal = other._field.doubleVal;
|
||||
break;
|
||||
case Type::BOOLEAN:
|
||||
_baseData.boolVal = other._baseData.boolVal;
|
||||
_field.boolVal = other._field.boolVal;
|
||||
break;
|
||||
case Type::STRING:
|
||||
_strData = other._strData;
|
||||
_field.strVal = other._field.strVal;
|
||||
break;
|
||||
case Type::VECTOR:
|
||||
CC_SAFE_DELETE(_vectorData);
|
||||
_vectorData = other._vectorData;
|
||||
_field.vectorVal = other._field.vectorVal;
|
||||
break;
|
||||
case Type::MAP:
|
||||
CC_SAFE_DELETE(_mapData);
|
||||
_mapData = other._mapData;
|
||||
_field.mapVal = other._field.mapVal;
|
||||
break;
|
||||
case Type::INT_KEY_MAP:
|
||||
CC_SAFE_DELETE(_intKeyMapData);
|
||||
_intKeyMapData = other._intKeyMapData;
|
||||
_field.intKeyMapVal = other._field.intKeyMapVal;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
_type = other._type;
|
||||
|
||||
other._vectorData = nullptr;
|
||||
other._mapData = nullptr;
|
||||
other._intKeyMapData = nullptr;
|
||||
memset(&other._field, 0, sizeof(other._field));
|
||||
other._type = Type::NONE;
|
||||
}
|
||||
|
||||
|
|
@ -272,147 +246,128 @@ Value& Value::operator= (Value&& other)
|
|||
|
||||
Value& Value::operator= (unsigned char v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::BYTE;
|
||||
_baseData.byteVal = v;
|
||||
reset(Type::BYTE);
|
||||
_field.byteVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (int v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::INTEGER;
|
||||
_baseData.intVal = v;
|
||||
reset(Type::INTEGER);
|
||||
_field.intVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (float v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::FLOAT;
|
||||
_baseData.floatVal = v;
|
||||
reset(Type::FLOAT);
|
||||
_field.floatVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (double v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::DOUBLE;
|
||||
_baseData.doubleVal = v;
|
||||
reset(Type::DOUBLE);
|
||||
_field.doubleVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (bool v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::BOOLEAN;
|
||||
_baseData.boolVal = v;
|
||||
reset(Type::BOOLEAN);
|
||||
_field.boolVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (const char* v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::STRING;
|
||||
_strData = v ? v : "";
|
||||
reset(Type::STRING);
|
||||
*_field.strVal = v ? v : "";
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (const std::string& v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::STRING;
|
||||
_strData = v;
|
||||
reset(Type::STRING);
|
||||
*_field.strVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (const ValueVector& v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::VECTOR;
|
||||
_vectorData = new ValueVector();
|
||||
*_vectorData = v;
|
||||
reset(Type::VECTOR);
|
||||
*_field.vectorVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (ValueVector&& v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::VECTOR;
|
||||
_vectorData = new ValueVector();
|
||||
*_vectorData = std::move(v);
|
||||
reset(Type::VECTOR);
|
||||
*_field.vectorVal = std::move(v);
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (const ValueMap& v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::MAP;
|
||||
_mapData = new ValueMap();
|
||||
*_mapData = v;
|
||||
reset(Type::MAP);
|
||||
*_field.mapVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (ValueMap&& v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::MAP;
|
||||
_mapData = new ValueMap();
|
||||
*_mapData = std::move(v);
|
||||
reset(Type::MAP);
|
||||
*_field.mapVal = std::move(v);
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (const ValueMapIntKey& v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::INT_KEY_MAP;
|
||||
_intKeyMapData = new ValueMapIntKey();
|
||||
*_intKeyMapData = v;
|
||||
reset(Type::INT_KEY_MAP);
|
||||
*_field.intKeyMapVal = v;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Value& Value::operator= (ValueMapIntKey&& v)
|
||||
{
|
||||
clear();
|
||||
_type = Type::INT_KEY_MAP;
|
||||
_intKeyMapData = new ValueMapIntKey();
|
||||
*_intKeyMapData = std::move(v);
|
||||
reset(Type::INT_KEY_MAP);
|
||||
*_field.intKeyMapVal = std::move(v);
|
||||
return *this;
|
||||
}
|
||||
|
||||
///
|
||||
/// Convert value to a specified type
|
||||
unsigned char Value::asByte() const
|
||||
{
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP, "");
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP && _type != Type::INT_KEY_MAP, "Only base type (bool, string, float, double, int) could be converted");
|
||||
|
||||
if (_type == Type::BYTE)
|
||||
{
|
||||
return _baseData.byteVal;
|
||||
return _field.byteVal;
|
||||
}
|
||||
|
||||
if (_type == Type::INTEGER)
|
||||
{
|
||||
return static_cast<unsigned char>(_baseData.intVal);
|
||||
return static_cast<unsigned char>(_field.intVal);
|
||||
}
|
||||
|
||||
if (_type == Type::STRING)
|
||||
{
|
||||
return static_cast<unsigned char>(atoi(_strData.c_str()));
|
||||
return static_cast<unsigned char>(atoi(_field.strVal->c_str()));
|
||||
}
|
||||
|
||||
if (_type == Type::FLOAT)
|
||||
{
|
||||
return static_cast<unsigned char>(_baseData.floatVal);
|
||||
return static_cast<unsigned char>(_field.floatVal);
|
||||
}
|
||||
|
||||
if (_type == Type::DOUBLE)
|
||||
{
|
||||
return static_cast<unsigned char>(_baseData.doubleVal);
|
||||
return static_cast<unsigned char>(_field.doubleVal);
|
||||
}
|
||||
|
||||
if (_type == Type::BOOLEAN)
|
||||
{
|
||||
return _baseData.boolVal ? 1 : 0;
|
||||
return _field.boolVal ? 1 : 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -420,35 +375,35 @@ unsigned char Value::asByte() const
|
|||
|
||||
int Value::asInt() const
|
||||
{
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP, "");
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP && _type != Type::INT_KEY_MAP, "Only base type (bool, string, float, double, int) could be converted");
|
||||
if (_type == Type::INTEGER)
|
||||
{
|
||||
return _baseData.intVal;
|
||||
return _field.intVal;
|
||||
}
|
||||
|
||||
if (_type == Type::BYTE)
|
||||
{
|
||||
return _baseData.byteVal;
|
||||
return _field.byteVal;
|
||||
}
|
||||
|
||||
if (_type == Type::STRING)
|
||||
{
|
||||
return atoi(_strData.c_str());
|
||||
return atoi(_field.strVal->c_str());
|
||||
}
|
||||
|
||||
if (_type == Type::FLOAT)
|
||||
{
|
||||
return static_cast<int>(_baseData.floatVal);
|
||||
return static_cast<int>(_field.floatVal);
|
||||
}
|
||||
|
||||
if (_type == Type::DOUBLE)
|
||||
{
|
||||
return static_cast<int>(_baseData.doubleVal);
|
||||
return static_cast<int>(_field.doubleVal);
|
||||
}
|
||||
|
||||
if (_type == Type::BOOLEAN)
|
||||
{
|
||||
return _baseData.boolVal ? 1 : 0;
|
||||
return _field.boolVal ? 1 : 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -456,35 +411,35 @@ int Value::asInt() const
|
|||
|
||||
float Value::asFloat() const
|
||||
{
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP, "");
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP && _type != Type::INT_KEY_MAP, "Only base type (bool, string, float, double, int) could be converted");
|
||||
if (_type == Type::FLOAT)
|
||||
{
|
||||
return _baseData.floatVal;
|
||||
return _field.floatVal;
|
||||
}
|
||||
|
||||
if (_type == Type::BYTE)
|
||||
{
|
||||
return static_cast<float>(_baseData.byteVal);
|
||||
return static_cast<float>(_field.byteVal);
|
||||
}
|
||||
|
||||
if (_type == Type::STRING)
|
||||
{
|
||||
return atof(_strData.c_str());
|
||||
return atof(_field.strVal->c_str());
|
||||
}
|
||||
|
||||
if (_type == Type::INTEGER)
|
||||
{
|
||||
return static_cast<float>(_baseData.intVal);
|
||||
return static_cast<float>(_field.intVal);
|
||||
}
|
||||
|
||||
if (_type == Type::DOUBLE)
|
||||
{
|
||||
return static_cast<float>(_baseData.doubleVal);
|
||||
return static_cast<float>(_field.doubleVal);
|
||||
}
|
||||
|
||||
if (_type == Type::BOOLEAN)
|
||||
{
|
||||
return _baseData.boolVal ? 1.0f : 0.0f;
|
||||
return _field.boolVal ? 1.0f : 0.0f;
|
||||
}
|
||||
|
||||
return 0.0f;
|
||||
|
|
@ -492,35 +447,35 @@ float Value::asFloat() const
|
|||
|
||||
double Value::asDouble() const
|
||||
{
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP, "");
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP && _type != Type::INT_KEY_MAP, "Only base type (bool, string, float, double, int) could be converted");
|
||||
if (_type == Type::DOUBLE)
|
||||
{
|
||||
return _baseData.doubleVal;
|
||||
return _field.doubleVal;
|
||||
}
|
||||
|
||||
if (_type == Type::BYTE)
|
||||
{
|
||||
return static_cast<double>(_baseData.byteVal);
|
||||
return static_cast<double>(_field.byteVal);
|
||||
}
|
||||
|
||||
if (_type == Type::STRING)
|
||||
{
|
||||
return static_cast<double>(atof(_strData.c_str()));
|
||||
return static_cast<double>(atof(_field.strVal->c_str()));
|
||||
}
|
||||
|
||||
if (_type == Type::INTEGER)
|
||||
{
|
||||
return static_cast<double>(_baseData.intVal);
|
||||
return static_cast<double>(_field.intVal);
|
||||
}
|
||||
|
||||
if (_type == Type::FLOAT)
|
||||
{
|
||||
return static_cast<double>(_baseData.floatVal);
|
||||
return static_cast<double>(_field.floatVal);
|
||||
}
|
||||
|
||||
if (_type == Type::BOOLEAN)
|
||||
{
|
||||
return _baseData.boolVal ? 1.0 : 0.0;
|
||||
return _field.boolVal ? 1.0 : 0.0;
|
||||
}
|
||||
|
||||
return 0.0;
|
||||
|
|
@ -528,35 +483,35 @@ double Value::asDouble() const
|
|||
|
||||
bool Value::asBool() const
|
||||
{
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP, "");
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP && _type != Type::INT_KEY_MAP, "Only base type (bool, string, float, double, int) could be converted");
|
||||
if (_type == Type::BOOLEAN)
|
||||
{
|
||||
return _baseData.boolVal;
|
||||
return _field.boolVal;
|
||||
}
|
||||
|
||||
if (_type == Type::BYTE)
|
||||
{
|
||||
return _baseData.byteVal == 0 ? false : true;
|
||||
return _field.byteVal == 0 ? false : true;
|
||||
}
|
||||
|
||||
if (_type == Type::STRING)
|
||||
{
|
||||
return (_strData == "0" || _strData == "false") ? false : true;
|
||||
return (*_field.strVal == "0" || *_field.strVal == "false") ? false : true;
|
||||
}
|
||||
|
||||
if (_type == Type::INTEGER)
|
||||
{
|
||||
return _baseData.intVal == 0 ? false : true;
|
||||
return _field.intVal == 0 ? false : true;
|
||||
}
|
||||
|
||||
if (_type == Type::FLOAT)
|
||||
{
|
||||
return _baseData.floatVal == 0.0f ? false : true;
|
||||
return _field.floatVal == 0.0f ? false : true;
|
||||
}
|
||||
|
||||
if (_type == Type::DOUBLE)
|
||||
{
|
||||
return _baseData.doubleVal == 0.0 ? false : true;
|
||||
return _field.doubleVal == 0.0 ? false : true;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
@ -564,31 +519,31 @@ bool Value::asBool() const
|
|||
|
||||
std::string Value::asString() const
|
||||
{
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP, "");
|
||||
CCASSERT(_type != Type::VECTOR && _type != Type::MAP && _type != Type::INT_KEY_MAP, "Only base type (bool, string, float, double, int) could be converted");
|
||||
|
||||
if (_type == Type::STRING)
|
||||
{
|
||||
return _strData;
|
||||
return *_field.strVal;
|
||||
}
|
||||
|
||||
std::stringstream ret;
|
||||
|
||||
|
||||
switch (_type) {
|
||||
switch (_type)
|
||||
{
|
||||
case Type::BYTE:
|
||||
ret << _baseData.byteVal;
|
||||
ret << _field.byteVal;
|
||||
break;
|
||||
case Type::INTEGER:
|
||||
ret << _baseData.intVal;
|
||||
ret << _field.intVal;
|
||||
break;
|
||||
case Type::FLOAT:
|
||||
ret << std::fixed << std::setprecision( 7 )<< _baseData.floatVal;
|
||||
ret << std::fixed << std::setprecision( 7 )<< _field.floatVal;
|
||||
break;
|
||||
case Type::DOUBLE:
|
||||
ret << std::fixed << std::setprecision( 16 ) << _baseData.doubleVal;
|
||||
ret << std::fixed << std::setprecision( 16 ) << _field.doubleVal;
|
||||
break;
|
||||
case Type::BOOLEAN:
|
||||
ret << (_baseData.boolVal ? "true" : "false");
|
||||
ret << (_field.boolVal ? "true" : "false");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
@ -598,47 +553,38 @@ std::string Value::asString() const
|
|||
|
||||
ValueVector& Value::asValueVector()
|
||||
{
|
||||
if (nullptr == _vectorData)
|
||||
_vectorData = new ValueVector();
|
||||
return *_vectorData;
|
||||
CCASSERT(_type == Type::VECTOR, "The value type isn't Type::VECTOR");
|
||||
return *_field.vectorVal;
|
||||
}
|
||||
|
||||
const ValueVector& Value::asValueVector() const
|
||||
{
|
||||
static const ValueVector EMPTY_VALUEVECTOR;
|
||||
if (nullptr == _vectorData)
|
||||
return EMPTY_VALUEVECTOR;
|
||||
return *_vectorData;
|
||||
CCASSERT(_type == Type::VECTOR, "The value type isn't Type::VECTOR");
|
||||
return *_field.vectorVal;
|
||||
}
|
||||
|
||||
ValueMap& Value::asValueMap()
|
||||
{
|
||||
if (nullptr == _mapData)
|
||||
_mapData = new ValueMap();
|
||||
return *_mapData;
|
||||
CCASSERT(_type == Type::MAP, "The value type isn't Type::MAP");
|
||||
return *_field.mapVal;
|
||||
}
|
||||
|
||||
const ValueMap& Value::asValueMap() const
|
||||
{
|
||||
static const ValueMap EMPTY_VALUEMAP;
|
||||
if (nullptr == _mapData)
|
||||
return EMPTY_VALUEMAP;
|
||||
return *_mapData;
|
||||
CCASSERT(_type == Type::MAP, "The value type isn't Type::MAP");
|
||||
return *_field.mapVal;
|
||||
}
|
||||
|
||||
ValueMapIntKey& Value::asIntKeyMap()
|
||||
{
|
||||
if (nullptr == _intKeyMapData)
|
||||
_intKeyMapData = new ValueMapIntKey();
|
||||
return *_intKeyMapData;
|
||||
CCASSERT(_type == Type::INT_KEY_MAP, "The value type isn't Type::INT_KEY_MAP");
|
||||
return *_field.intKeyMapVal;
|
||||
}
|
||||
|
||||
const ValueMapIntKey& Value::asIntKeyMap() const
|
||||
{
|
||||
static const ValueMapIntKey EMPTY_VALUEMAP_INT_KEY;
|
||||
if (nullptr == _intKeyMapData)
|
||||
return EMPTY_VALUEMAP_INT_KEY;
|
||||
return *_intKeyMapData;
|
||||
CCASSERT(_type == Type::INT_KEY_MAP, "The value type isn't Type::INT_KEY_MAP");
|
||||
return *_field.intKeyMapVal;
|
||||
}
|
||||
|
||||
static std::string getTabs(int depth)
|
||||
|
|
@ -738,12 +684,70 @@ std::string Value::getDescription()
|
|||
|
||||
void Value::clear()
|
||||
{
|
||||
// Free memory the old value allocated
|
||||
switch (_type)
|
||||
{
|
||||
case Type::BYTE:
|
||||
_field.byteVal = 0;
|
||||
break;
|
||||
case Type::INTEGER:
|
||||
_field.intVal = 0;
|
||||
break;
|
||||
case Type::FLOAT:
|
||||
_field.floatVal = 0.0f;
|
||||
break;
|
||||
case Type::DOUBLE:
|
||||
_field.doubleVal = 0.0;
|
||||
break;
|
||||
case Type::BOOLEAN:
|
||||
_field.boolVal = false;
|
||||
break;
|
||||
case Type::STRING:
|
||||
CC_SAFE_DELETE(_field.strVal);
|
||||
break;
|
||||
case Type::VECTOR:
|
||||
CC_SAFE_DELETE(_field.vectorVal);
|
||||
break;
|
||||
case Type::MAP:
|
||||
CC_SAFE_DELETE(_field.mapVal);
|
||||
break;
|
||||
case Type::INT_KEY_MAP:
|
||||
CC_SAFE_DELETE(_field.intKeyMapVal);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
_type = Type::NONE;
|
||||
_baseData.doubleVal = 0.0;
|
||||
_strData.clear();
|
||||
CC_SAFE_DELETE(_vectorData);
|
||||
CC_SAFE_DELETE(_mapData);
|
||||
CC_SAFE_DELETE(_intKeyMapData);
|
||||
}
|
||||
|
||||
void Value::reset(Type type)
|
||||
{
|
||||
if (_type == type)
|
||||
return;
|
||||
|
||||
clear();
|
||||
|
||||
// Allocate memory for the new value
|
||||
switch (type)
|
||||
{
|
||||
case Type::STRING:
|
||||
_field.strVal = new std::string();
|
||||
break;
|
||||
case Type::VECTOR:
|
||||
_field.vectorVal = new ValueVector();
|
||||
break;
|
||||
case Type::MAP:
|
||||
_field.mapVal = new ValueMap();
|
||||
break;
|
||||
case Type::INT_KEY_MAP:
|
||||
_field.intKeyMapVal = new ValueMapIntKey();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
_type = type;
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ public:
|
|||
|
||||
enum class Type
|
||||
{
|
||||
NONE,
|
||||
NONE = 0,
|
||||
BYTE,
|
||||
INTEGER,
|
||||
FLOAT,
|
||||
|
|
@ -125,6 +125,7 @@ public:
|
|||
|
||||
private:
|
||||
void clear();
|
||||
void reset(Type type);
|
||||
|
||||
union
|
||||
{
|
||||
|
|
@ -133,12 +134,12 @@ private:
|
|||
float floatVal;
|
||||
double doubleVal;
|
||||
bool boolVal;
|
||||
}_baseData;
|
||||
|
||||
std::string _strData;
|
||||
ValueVector* _vectorData;
|
||||
ValueMap* _mapData;
|
||||
ValueMapIntKey* _intKeyMapData;
|
||||
std::string* strVal;
|
||||
ValueVector* vectorVal;
|
||||
ValueMap* mapVal;
|
||||
ValueMapIntKey* intKeyMapVal;
|
||||
}_field;
|
||||
|
||||
Type _type;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -105,10 +105,10 @@ default gl blend src function. Compatible with premultiplied alpha images.
|
|||
*/
|
||||
#define CC_NODE_DRAW_SETUP() \
|
||||
do { \
|
||||
CCASSERT(getShaderProgram(), "No shader program set for this node"); \
|
||||
CCASSERT(getGLProgram(), "No shader program set for this node"); \
|
||||
{ \
|
||||
getShaderProgram()->use(); \
|
||||
getShaderProgram()->setUniformsForBuiltins(_modelViewTransform); \
|
||||
getGLProgram()->use(); \
|
||||
getGLProgram()->setUniformsForBuiltins(_modelViewTransform); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ NS_CC_BEGIN
|
|||
|
||||
const char* cocos2dVersion()
|
||||
{
|
||||
return "cocos2d-x 3.1alpha0";
|
||||
return "cocos2d-x 3.1alpha1";
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -140,6 +140,11 @@ THE SOFTWARE.
|
|||
#include "renderer/CCRenderCommand.h"
|
||||
#include "renderer/CCRenderCommandPool.h"
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "renderer/CCGLProgram.h"
|
||||
#include "renderer/CCGLProgramCache.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "renderer/ccGLStateCache.h"
|
||||
#include "renderer/ccShaders.h"
|
||||
|
||||
// physics
|
||||
#include "physics/CCPhysicsBody.h"
|
||||
|
|
@ -219,12 +224,6 @@ THE SOFTWARE.
|
|||
// script_support
|
||||
#include "2d/CCScriptSupport.h"
|
||||
|
||||
// shaders
|
||||
#include "2d/CCGLProgram.h"
|
||||
#include "2d/ccGLStateCache.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "2d/ccShaders.h"
|
||||
|
||||
// sprite_nodes
|
||||
#include "2d/CCAnimation.h"
|
||||
#include "2d/CCAnimationCache.h"
|
||||
|
|
|
|||
|
|
@ -25,6 +25,13 @@
|
|||
|
||||
#include "cocos2d.h"
|
||||
|
||||
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#elif _MSC_VER >= 1400 //vs 2005 or higher
|
||||
#pragma warning (push)
|
||||
#pragma warning (disable: 4996)
|
||||
#endif
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
const Vector2 CCPointZero = Vector2::ZERO;
|
||||
|
|
@ -568,4 +575,24 @@ Vector4* kmVec4Transform(Vector4* pOut, const Vector4* pV, const Matrix* pM)
|
|||
return pOut;
|
||||
}
|
||||
|
||||
const Vector3 KM_VEC3_NEG_Z = Vector3(0, 0, -1);
|
||||
const Vector3 KM_VEC3_POS_Z = Vector3(0, 0, 1);
|
||||
const Vector3 KM_VEC3_POS_Y = Vector3(0, 1, 0);
|
||||
const Vector3 KM_VEC3_NEG_Y = Vector3(0, -1, 0);
|
||||
const Vector3 KM_VEC3_NEG_X = Vector3(-1, 0, 0);
|
||||
const Vector3 KM_VEC3_POS_X = Vector3(1, 0, 0);
|
||||
const Vector3 KM_VEC3_ZERO = Vector3(0, 0, 0);
|
||||
|
||||
const Vector2 KM_VEC2_POS_Y = Vector2(0, 1);
|
||||
const Vector2 KM_VEC2_NEG_Y = Vector2(0, -1);
|
||||
const Vector2 KM_VEC2_NEG_X = Vector2(-1, 0);
|
||||
const Vector2 KM_VEC2_POS_X = Vector2(1, 0);
|
||||
const Vector2 KM_VEC2_ZERO = Vector2(0, 0);
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
|
||||
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
|
||||
#elif _MSC_VER >= 1400 //vs 2005 or higher
|
||||
#pragma warning (pop)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -751,7 +751,8 @@ CC_DEPRECATED_ATTRIBUTE typedef ParticleSnow CCParticleSnow;
|
|||
CC_DEPRECATED_ATTRIBUTE typedef ParticleRain CCParticleRain;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef FileUtils CCFileUtils;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef Application CCApplication;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef ShaderCache CCShaderCache;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef GLProgramCache CCShaderCache;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef GLProgramCache ShaderCache;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef AnimationCache CCAnimationCache;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef SpriteFrameCache CCSpriteFrameCache;
|
||||
CC_DEPRECATED_ATTRIBUTE typedef TextureCache CCTextureCache;
|
||||
|
|
@ -806,7 +807,7 @@ CC_DEPRECATED_ATTRIBUTE typedef void* CCZone;
|
|||
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttrib_Position = GLProgram::VERTEX_ATTRIB_POSITION;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttrib_Color = GLProgram::VERTEX_ATTRIB_COLOR;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttrib_TexCoords = GLProgram::VERTEX_ATTRIB_TEX_COORDS;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttrib_TexCoords = GLProgram::VERTEX_ATTRIB_TEX_COORD;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttrib_MAX = GLProgram::VERTEX_ATTRIB_MAX;
|
||||
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCUniformPMatrix = GLProgram::UNIFORM_P_MATRIX;
|
||||
|
|
@ -847,7 +848,7 @@ CC_DEPRECATED_ATTRIBUTE extern const char* kCCAttributeNameTexCoord;
|
|||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttribFlag_None = GL::VERTEX_ATTRIB_FLAG_NONE;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttribFlag_Position = GL::VERTEX_ATTRIB_FLAG_POSITION;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttribFlag_Color = GL::VERTEX_ATTRIB_FLAG_COLOR;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttribFlag_TexCoords = GL::VERTEX_ATTRIB_FLAG_TEX_COORDS;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttribFlag_TexCoords = GL::VERTEX_ATTRIB_FLAG_TEX_COORD;
|
||||
CC_DEPRECATED_ATTRIBUTE const int kCCVertexAttribFlag_PosColorTex = GL::VERTEX_ATTRIB_FLAG_POS_COLOR_TEX;
|
||||
|
||||
CC_DEPRECATED_ATTRIBUTE const ProgressTimer::Type kCCProgressTimerTypeRadial = ProgressTimer::Type::RADIAL;
|
||||
|
|
@ -1109,13 +1110,13 @@ CC_DEPRECATED_ATTRIBUTE CC_DLL Vector3* kmVec3Scale(Vector3* pOut, const Vector3
|
|||
CC_DEPRECATED_ATTRIBUTE CC_DLL Vector3* kmVec3Assign(Vector3* pOut, const Vector3* pIn);
|
||||
CC_DEPRECATED_ATTRIBUTE CC_DLL Vector3* kmVec3Zero(Vector3* pOut);
|
||||
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector3 KM_VEC3_NEG_Z = Vector3(0, 0, -1);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector3 KM_VEC3_POS_Z = Vector3(0, 0, 1);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector3 KM_VEC3_POS_Y = Vector3(0, 1, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector3 KM_VEC3_NEG_Y = Vector3(0, -1, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector3 KM_VEC3_NEG_X = Vector3(-1, 0, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector3 KM_VEC3_POS_X = Vector3(1, 0, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector3 KM_VEC3_ZERO = Vector3(0, 0, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector3 KM_VEC3_NEG_Z;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector3 KM_VEC3_POS_Z;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector3 KM_VEC3_POS_Y;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector3 KM_VEC3_NEG_Y;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector3 KM_VEC3_NEG_X;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector3 KM_VEC3_POS_X;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector3 KM_VEC3_ZERO;
|
||||
|
||||
//kmVec2
|
||||
CC_DEPRECATED_ATTRIBUTE typedef Vector2 kmVec2;
|
||||
|
|
@ -1130,11 +1131,11 @@ CC_DEPRECATED_ATTRIBUTE CC_DLL Vector2* kmVec2Subtract(Vector2* pOut, const Vect
|
|||
CC_DEPRECATED_ATTRIBUTE CC_DLL Vector2* kmVec2Scale(Vector2* pOut, const Vector2* pIn, const float s);
|
||||
CC_DEPRECATED_ATTRIBUTE CC_DLL Vector2* kmVec2Assign(Vector2* pOut, const Vector2* pIn);
|
||||
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector2 KM_VEC2_POS_Y = Vector2(0, 1);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector2 KM_VEC2_NEG_Y = Vector2(0, -1);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector2 KM_VEC2_NEG_X = Vector2(-1, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector2 KM_VEC2_POS_X = Vector2(1, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE const Vector2 KM_VEC2_ZERO = Vector2(0, 0);
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector2 KM_VEC2_POS_Y;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector2 KM_VEC2_NEG_Y;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector2 KM_VEC2_NEG_X;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector2 KM_VEC2_POS_X;
|
||||
CC_DEPRECATED_ATTRIBUTE extern const Vector2 KM_VEC2_ZERO;
|
||||
|
||||
//kmVec4
|
||||
CC_DEPRECATED_ATTRIBUTE typedef Vector4 kmVec4;
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ __String* __String::createWithFormat(const char* format, ...)
|
|||
return ret;
|
||||
}
|
||||
|
||||
__String* __String::createWithContentsOfFile(const char* filename)
|
||||
__String* __String::createWithContentsOfFile(const std::string &filename)
|
||||
{
|
||||
std::string str = FileUtils::getInstance()->getStringFromFile(filename);
|
||||
return __String::create(std::move(str));
|
||||
|
|
@ -272,4 +272,29 @@ __String* __String::clone() const
|
|||
return __String::create(_string);
|
||||
}
|
||||
|
||||
namespace StringUtils {
|
||||
|
||||
std::string format(const char* format, ...)
|
||||
{
|
||||
#define CC_MAX_STRING_LENGTH (1024*100)
|
||||
|
||||
std::string ret;
|
||||
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
|
||||
char* buf = (char*)malloc(CC_MAX_STRING_LENGTH);
|
||||
if (buf != nullptr)
|
||||
{
|
||||
vsnprintf(buf, CC_MAX_STRING_LENGTH, format, ap);
|
||||
ret = buf;
|
||||
free(buf);
|
||||
}
|
||||
va_end(ap);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
} // namespace StringUtils {
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ public:
|
|||
* it means that you needn't do a release operation unless you retain it.
|
||||
* @js NA
|
||||
*/
|
||||
static __String* createWithContentsOfFile(const char* filename);
|
||||
static __String* createWithContentsOfFile(const std::string& filename);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
|
|
@ -205,40 +205,19 @@ struct StringCompare : public std::binary_function<__String *, __String *, bool>
|
|||
#define StringMake(str) String::create(str)
|
||||
#define ccs StringMake
|
||||
|
||||
class StringUtils
|
||||
{
|
||||
public:
|
||||
namespace StringUtils {
|
||||
|
||||
template<typename T>
|
||||
static std::string toString(T arg)
|
||||
std::string toString(T arg)
|
||||
{
|
||||
std::stringstream ss;
|
||||
ss << arg;
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
static std::string format(const char* format, ...) CC_FORMAT_PRINTF(1, 2)
|
||||
{
|
||||
#define CC_MAX_STRING_LENGTH (1024*100)
|
||||
std::string format(const char* format, ...) CC_FORMAT_PRINTF(1, 2);
|
||||
|
||||
std::string ret;
|
||||
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
|
||||
char* buf = (char*)malloc(CC_MAX_STRING_LENGTH);
|
||||
if (buf != nullptr)
|
||||
{
|
||||
vsnprintf(buf, CC_MAX_STRING_LENGTH, format, ap);
|
||||
ret = buf;
|
||||
free(buf);
|
||||
}
|
||||
va_end(ap);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
};
|
||||
} // namespace StringUtils {
|
||||
|
||||
// end of data_structure group
|
||||
/// @}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ THE SOFTWARE.
|
|||
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "renderer/CCGroupCommand.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "2d/CCDrawingPrimitives.h"
|
||||
#include "base/CCDirector.h"
|
||||
|
||||
|
|
@ -182,7 +182,7 @@ bool Armature::init(const std::string& name)
|
|||
|
||||
}
|
||||
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
|
||||
setCascadeOpacityEnabled(true);
|
||||
setCascadeColorEnabled(true);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ THE SOFTWARE.
|
|||
|
||||
#include "renderer/CCRenderer.h"
|
||||
#include "renderer/CCGroupCommand.h"
|
||||
#include "2d/CCShaderCache.h"
|
||||
#include "renderer/CCGLProgramState.h"
|
||||
#include "base/CCDirector.h"
|
||||
|
||||
using namespace cocos2d;
|
||||
|
|
@ -61,7 +61,7 @@ BatchNode::~BatchNode()
|
|||
bool BatchNode::init()
|
||||
{
|
||||
bool ret = Node::init();
|
||||
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -218,6 +218,30 @@ Widget* GUIReader::widgetFromJsonFile(const char *fileName)
|
|||
}
|
||||
|
||||
|
||||
void WidgetPropertiesReader::setAnchorPointForWidget(cocos2d::ui::Widget *widget, const rapidjson::Value &options)
|
||||
{
|
||||
bool isAnchorPointXExists = DICTOOL->checkObjectExist_json(options, "anchorPointX");
|
||||
float anchorPointXInFile;
|
||||
if (isAnchorPointXExists) {
|
||||
anchorPointXInFile = DICTOOL->getFloatValue_json(options, "anchorPointX");
|
||||
}else{
|
||||
anchorPointXInFile = widget->getAnchorPoint().x;
|
||||
}
|
||||
|
||||
bool isAnchorPointYExists = DICTOOL->checkObjectExist_json(options, "anchorPointY");
|
||||
float anchorPointYInFile;
|
||||
if (isAnchorPointYExists) {
|
||||
anchorPointYInFile = DICTOOL->getFloatValue_json(options, "anchorPointY");
|
||||
}
|
||||
else{
|
||||
anchorPointYInFile = widget->getAnchorPoint().y;
|
||||
}
|
||||
|
||||
if (isAnchorPointXExists || isAnchorPointYExists) {
|
||||
widget->setAnchorPoint(Vector2(anchorPointXInFile, anchorPointYInFile));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Widget* WidgetPropertiesReader0250::createWidget(const rapidjson::Value& data, const char* fullPath, const char* fileName)
|
||||
{
|
||||
|
|
@ -411,11 +435,9 @@ void WidgetPropertiesReader0250::setColorPropsForWidgetFromJsonDictionary(Widget
|
|||
int colorG = cg ? DICTOOL->getIntValue_json(options, "colorG") : 255;
|
||||
int colorB = cb ? DICTOOL->getIntValue_json(options, "colorB") : 255;
|
||||
widget->setColor(Color3B(colorR, colorG, colorB));
|
||||
bool apx = DICTOOL->checkObjectExist_json(options, "anchorPointX");
|
||||
float apxf = apx ? DICTOOL->getFloatValue_json(options, "anchorPointX") : ((widget->getWidgetType() == WidgetTypeWidget) ? 0.5f : 0.0f);
|
||||
bool apy = DICTOOL->checkObjectExist_json(options, "anchorPointY");
|
||||
float apyf = apy ? DICTOOL->getFloatValue_json(options, "anchorPointY") : ((widget->getWidgetType() == WidgetTypeWidget) ? 0.5f : 0.0f);
|
||||
widget->setAnchorPoint(Vector2(apxf, apyf));
|
||||
|
||||
this->setAnchorPointForWidget(widget, options);
|
||||
|
||||
bool flipX = DICTOOL->getBooleanValue_json(options, "flipX");
|
||||
bool flipY = DICTOOL->getBooleanValue_json(options, "flipY");
|
||||
widget->setFlippedX(flipX);
|
||||
|
|
@ -450,7 +472,7 @@ void WidgetPropertiesReader0250::setPropsForButtonFromJsonDictionary(Widget*widg
|
|||
|
||||
if (useMergedTexture)
|
||||
{
|
||||
button->loadTextures(normalFileName, pressedFileName, disabledFileName,UI_TEX_TYPE_PLIST);
|
||||
button->loadTextures(normalFileName, pressedFileName, disabledFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -470,7 +492,7 @@ void WidgetPropertiesReader0250::setPropsForButtonFromJsonDictionary(Widget*widg
|
|||
{
|
||||
if (useMergedTexture)
|
||||
{
|
||||
button->loadTextures(normalFileName, pressedFileName, disabledFileName,UI_TEX_TYPE_PLIST);
|
||||
button->loadTextures(normalFileName, pressedFileName, disabledFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -531,7 +553,7 @@ void WidgetPropertiesReader0250::setPropsForCheckBoxFromJsonDictionary(Widget*wi
|
|||
|
||||
if (useMergedTexture)
|
||||
{
|
||||
checkBox->loadTextures(backGroundFileName, backGroundSelectedFileName, frontCrossFileName,backGroundDisabledFileName,frontCrossDisabledFileName,UI_TEX_TYPE_PLIST);
|
||||
checkBox->loadTextures(backGroundFileName, backGroundSelectedFileName, frontCrossFileName,backGroundDisabledFileName,frontCrossDisabledFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -566,7 +588,7 @@ void WidgetPropertiesReader0250::setPropsForImageViewFromJsonDictionary(Widget*w
|
|||
{
|
||||
if (useMergedTexture)
|
||||
{
|
||||
imageView->loadTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
imageView->loadTexture(imageFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -593,7 +615,7 @@ void WidgetPropertiesReader0250::setPropsForImageViewFromJsonDictionary(Widget*w
|
|||
{
|
||||
if (useMergedTexture)
|
||||
{
|
||||
imageView->loadTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
imageView->loadTexture(imageFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -694,7 +716,7 @@ void WidgetPropertiesReader0250::setPropsForLayoutFromJsonDictionary(Widget*widg
|
|||
int co = DICTOOL->getIntValue_json(options, "bgColorOpacity");
|
||||
|
||||
int colorType = DICTOOL->getIntValue_json(options, "colorType");
|
||||
panel->setBackGroundColorType(LayoutBackGroundColorType(colorType));
|
||||
panel->setBackGroundColorType(Layout::BackGroundColorType(colorType));
|
||||
panel->setBackGroundColor(Color3B(scr, scg, scb),Color3B(ecr, ecg, ecb));
|
||||
panel->setBackGroundColor(Color3B(cr, cg, cb));
|
||||
panel->setBackGroundColorOpacity(co);
|
||||
|
|
@ -711,7 +733,7 @@ void WidgetPropertiesReader0250::setPropsForLayoutFromJsonDictionary(Widget*widg
|
|||
float ch = DICTOOL->getFloatValue_json(options, "capInsetsHeight");
|
||||
if (useMergedTexture)
|
||||
{
|
||||
panel->setBackGroundImage(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
panel->setBackGroundImage(imageFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -724,7 +746,7 @@ void WidgetPropertiesReader0250::setPropsForLayoutFromJsonDictionary(Widget*widg
|
|||
|
||||
if (useMergedTexture)
|
||||
{
|
||||
panel->setBackGroundImage(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
panel->setBackGroundImage(imageFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -742,7 +764,7 @@ void WidgetPropertiesReader0250::setPropsForScrollViewFromJsonDictionary(Widget*
|
|||
float innerHeight = DICTOOL->getFloatValue_json(options, "innerHeight");
|
||||
scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
|
||||
int direction = DICTOOL->getFloatValue_json(options, "direction");
|
||||
scrollView->setDirection((SCROLLVIEW_DIR)direction);
|
||||
scrollView->setDirection((ScrollView::Direction)direction);
|
||||
scrollView->setBounceEnabled(DICTOOL->getBooleanValue_json(options, "bounceEnable"));
|
||||
setColorPropsForWidgetFromJsonDictionary(widget,options);
|
||||
}
|
||||
|
|
@ -766,7 +788,7 @@ void WidgetPropertiesReader0250::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
|
||||
if (useMergedTexture)
|
||||
{
|
||||
slider->loadBarTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadBarTexture(imageFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -781,7 +803,7 @@ void WidgetPropertiesReader0250::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
|
||||
if (useMergedTexture)
|
||||
{
|
||||
slider->loadBarTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadBarTexture(imageFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -802,7 +824,7 @@ void WidgetPropertiesReader0250::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
const char* disabledFileName_tp = (disabledFileName && (strcmp(disabledFileName, "") != 0))?tp_d.append(disabledFileName).c_str():nullptr;
|
||||
if (useMergedTexture)
|
||||
{
|
||||
slider->loadSlidBallTextures(normalFileName,pressedFileName,disabledFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadSlidBallTextures(normalFileName,pressedFileName,disabledFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -815,7 +837,7 @@ void WidgetPropertiesReader0250::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
|
||||
if (useMergedTexture)
|
||||
{
|
||||
slider->loadProgressBarTexture(imageFileName, UI_TEX_TYPE_PLIST);
|
||||
slider->loadProgressBarTexture(imageFileName, TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -884,13 +906,13 @@ void WidgetPropertiesReader0250::setPropsForLoadingBarFromJsonDictionary(Widget
|
|||
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
|
||||
if (useMergedTexture)
|
||||
{
|
||||
loadingBar->loadTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
loadingBar->loadTexture(imageFileName,TextureResType::PLIST);
|
||||
}
|
||||
else
|
||||
{
|
||||
loadingBar->loadTexture(imageFileName_tp);
|
||||
}
|
||||
loadingBar->setDirection(LoadingBarType(DICTOOL->getIntValue_json(options, "direction")));
|
||||
loadingBar->setBarDirection(LoadingBar::Direction(DICTOOL->getIntValue_json(options, "direction")));
|
||||
loadingBar->setPercent(DICTOOL->getIntValue_json(options, "percent"));
|
||||
setColorPropsForWidgetFromJsonDictionary(widget,options);
|
||||
}
|
||||
|
|
@ -1111,7 +1133,7 @@ Widget* WidgetPropertiesReader0300::widgetFromJsonDictionary(const rapidjson::Va
|
|||
{
|
||||
if (!dynamic_cast<Layout*>(widget))
|
||||
{
|
||||
if (child->getPositionType() == cocos2d::ui::POSITION_PERCENT)
|
||||
if (child->getPositionType() == ui::Widget::PositionType::PERCENT)
|
||||
{
|
||||
child->setPositionPercent(Vector2(child->getPositionPercent().x + widget->getAnchorPoint().x, child->getPositionPercent().y + widget->getAnchorPoint().y));
|
||||
}
|
||||
|
|
@ -1133,8 +1155,8 @@ void WidgetPropertiesReader0300::setPropsForWidgetFromJsonDictionary(Widget*widg
|
|||
widget->ignoreContentAdaptWithSize(DICTOOL->getBooleanValue_json(options, "ignoreSize"));
|
||||
}
|
||||
|
||||
widget->setSizeType((SizeType)DICTOOL->getIntValue_json(options, "sizeType"));
|
||||
widget->setPositionType((PositionType)DICTOOL->getIntValue_json(options, "positionType"));
|
||||
widget->setSizeType((Widget::SizeType)DICTOOL->getIntValue_json(options, "sizeType"));
|
||||
widget->setPositionType((Widget::PositionType)DICTOOL->getIntValue_json(options, "positionType"));
|
||||
|
||||
widget->setSizePercent(Vector2(DICTOOL->getFloatValue_json(options, "sizePercentX"), DICTOOL->getFloatValue_json(options, "sizePercentY")));
|
||||
widget->setPositionPercent(Vector2(DICTOOL->getFloatValue_json(options, "positionPercentX"), DICTOOL->getFloatValue_json(options, "positionPercentY")));
|
||||
|
|
@ -1189,7 +1211,7 @@ void WidgetPropertiesReader0300::setPropsForWidgetFromJsonDictionary(Widget*widg
|
|||
{
|
||||
parameter = LinearLayoutParameter::create();
|
||||
int gravity = DICTOOL->getIntValue_json(layoutParameterDic, "gravity");
|
||||
((LinearLayoutParameter*)parameter)->setGravity((LinearGravity)gravity);
|
||||
((LinearLayoutParameter*)parameter)->setGravity((LinearLayoutParameter::LinearGravity)gravity);
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
|
|
@ -1201,7 +1223,7 @@ void WidgetPropertiesReader0300::setPropsForWidgetFromJsonDictionary(Widget*widg
|
|||
const char* relativeToName = DICTOOL->getStringValue_json(layoutParameterDic, "relativeToName");
|
||||
rParameter->setRelativeToWidgetName(relativeToName);
|
||||
int align = DICTOOL->getIntValue_json(layoutParameterDic, "align");
|
||||
rParameter->setAlign((RelativeAlign)align);
|
||||
rParameter->setAlign((RelativeLayoutParameter::RelativeAlign)align);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1233,17 +1255,17 @@ void WidgetPropertiesReader0300::setColorPropsForWidgetFromJsonDictionary(Widget
|
|||
int colorG = cg ? DICTOOL->getIntValue_json(options, "colorG") : 255;
|
||||
int colorB = cb ? DICTOOL->getIntValue_json(options, "colorB") : 255;
|
||||
widget->setColor(Color3B(colorR, colorG, colorB));
|
||||
bool apx = DICTOOL->checkObjectExist_json(options, "anchorPointX");
|
||||
float apxf = apx ? DICTOOL->getFloatValue_json(options, "anchorPointX") : ((widget->getWidgetType() == WidgetTypeWidget) ? 0.5f : 0.0f);
|
||||
bool apy = DICTOOL->checkObjectExist_json(options, "anchorPointY");
|
||||
float apyf = apy ? DICTOOL->getFloatValue_json(options, "anchorPointY") : ((widget->getWidgetType() == WidgetTypeWidget) ? 0.5f : 0.0f);
|
||||
widget->setAnchorPoint(Vector2(apxf, apyf));
|
||||
|
||||
this->setAnchorPointForWidget(widget, options);
|
||||
|
||||
bool flipX = DICTOOL->getBooleanValue_json(options, "flipX");
|
||||
bool flipY = DICTOOL->getBooleanValue_json(options, "flipY");
|
||||
widget->setFlippedX(flipX);
|
||||
widget->setFlippedY(flipY);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void WidgetPropertiesReader0300::setPropsForButtonFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
|
||||
{
|
||||
setPropsForWidgetFromJsonDictionary(widget, options);
|
||||
|
|
@ -1266,7 +1288,7 @@ void WidgetPropertiesReader0300::setPropsForButtonFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* normalFileName = DICTOOL->getStringValue_json(normalDic, "path");
|
||||
button->loadTextureNormal(normalFileName,UI_TEX_TYPE_PLIST);
|
||||
button->loadTextureNormal(normalFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1287,7 +1309,7 @@ void WidgetPropertiesReader0300::setPropsForButtonFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* pressedFileName = DICTOOL->getStringValue_json(pressedDic, "path");
|
||||
button->loadTexturePressed(pressedFileName,UI_TEX_TYPE_PLIST);
|
||||
button->loadTexturePressed(pressedFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1308,7 +1330,7 @@ void WidgetPropertiesReader0300::setPropsForButtonFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* disabledFileName = DICTOOL->getStringValue_json(disabledDic, "path");
|
||||
button->loadTextureDisabled(disabledFileName,UI_TEX_TYPE_PLIST);
|
||||
button->loadTextureDisabled(disabledFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1381,7 +1403,7 @@ void WidgetPropertiesReader0300::setPropsForCheckBoxFromJsonDictionary(Widget*wi
|
|||
case 1:
|
||||
{
|
||||
const char* backGroundFileName = DICTOOL->getStringValue_json(backGroundDic, "path");
|
||||
checkBox->loadTextureBackGround(backGroundFileName,UI_TEX_TYPE_PLIST);
|
||||
checkBox->loadTextureBackGround(backGroundFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1403,7 +1425,7 @@ void WidgetPropertiesReader0300::setPropsForCheckBoxFromJsonDictionary(Widget*wi
|
|||
case 1:
|
||||
{
|
||||
const char* backGroundSelectedFileName = DICTOOL->getStringValue_json(backGroundSelectedDic, "path");
|
||||
checkBox->loadTextureBackGroundSelected(backGroundSelectedFileName,UI_TEX_TYPE_PLIST);
|
||||
checkBox->loadTextureBackGroundSelected(backGroundSelectedFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1425,7 +1447,7 @@ void WidgetPropertiesReader0300::setPropsForCheckBoxFromJsonDictionary(Widget*wi
|
|||
case 1:
|
||||
{
|
||||
const char* frontCrossFileName = DICTOOL->getStringValue_json(frontCrossDic, "path");
|
||||
checkBox->loadTextureFrontCross(frontCrossFileName,UI_TEX_TYPE_PLIST);
|
||||
checkBox->loadTextureFrontCross(frontCrossFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1447,7 +1469,7 @@ void WidgetPropertiesReader0300::setPropsForCheckBoxFromJsonDictionary(Widget*wi
|
|||
case 1:
|
||||
{
|
||||
const char* backGroundDisabledFileName = DICTOOL->getStringValue_json(backGroundDisabledDic, "path");
|
||||
checkBox->loadTextureBackGroundDisabled(backGroundDisabledFileName,UI_TEX_TYPE_PLIST);
|
||||
checkBox->loadTextureBackGroundDisabled(backGroundDisabledFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1469,7 +1491,7 @@ void WidgetPropertiesReader0300::setPropsForCheckBoxFromJsonDictionary(Widget*wi
|
|||
case 1:
|
||||
{
|
||||
const char* frontCrossDisabledFileName = DICTOOL->getStringValue_json(options, "path");
|
||||
checkBox->loadTextureFrontCrossDisabled(frontCrossDisabledFileName,UI_TEX_TYPE_PLIST);
|
||||
checkBox->loadTextureFrontCrossDisabled(frontCrossDisabledFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1504,7 +1526,7 @@ void WidgetPropertiesReader0300::setPropsForImageViewFromJsonDictionary(Widget*w
|
|||
case 1:
|
||||
{
|
||||
const char* imageFileName = DICTOOL->getStringValue_json(imageFileNameDic, "path");
|
||||
imageView->loadTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
imageView->loadTexture(imageFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1658,7 +1680,7 @@ void WidgetPropertiesReader0300::setPropsForLayoutFromJsonDictionary(Widget*widg
|
|||
int co = DICTOOL->getIntValue_json(options, "bgColorOpacity");
|
||||
|
||||
int colorType = DICTOOL->getIntValue_json(options, "colorType");
|
||||
panel->setBackGroundColorType(LayoutBackGroundColorType(colorType));
|
||||
panel->setBackGroundColorType(Layout::BackGroundColorType(colorType));
|
||||
panel->setBackGroundColor(Color3B(scr, scg, scb),Color3B(ecr, ecg, ecb));
|
||||
panel->setBackGroundColor(Color3B(cr, cg, cb));
|
||||
panel->setBackGroundColorOpacity(co);
|
||||
|
|
@ -1679,7 +1701,7 @@ void WidgetPropertiesReader0300::setPropsForLayoutFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* imageFileName = DICTOOL->getStringValue_json(imageFileNameDic, "path");
|
||||
panel->setBackGroundImage(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
panel->setBackGroundImage(imageFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1694,7 +1716,7 @@ void WidgetPropertiesReader0300::setPropsForLayoutFromJsonDictionary(Widget*widg
|
|||
float ch = DICTOOL->getFloatValue_json(options, "capInsetsHeight");
|
||||
panel->setBackGroundImageCapInsets(Rect(cx, cy, cw, ch));
|
||||
}
|
||||
panel->setLayoutType((LayoutType)DICTOOL->getIntValue_json(options, "layoutType"));
|
||||
panel->setLayoutType((Layout::Type)DICTOOL->getIntValue_json(options, "layoutType"));
|
||||
setColorPropsForWidgetFromJsonDictionary(widget,options);
|
||||
}
|
||||
|
||||
|
|
@ -1706,7 +1728,7 @@ void WidgetPropertiesReader0300::setPropsForScrollViewFromJsonDictionary(Widget*
|
|||
float innerHeight = DICTOOL->getFloatValue_json(options, "innerHeight");
|
||||
scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
|
||||
int direction = DICTOOL->getFloatValue_json(options, "direction");
|
||||
scrollView->setDirection((SCROLLVIEW_DIR)direction);
|
||||
scrollView->setDirection((ScrollView::Direction)direction);
|
||||
scrollView->setBounceEnabled(DICTOOL->getBooleanValue_json(options, "bounceEnable"));
|
||||
setColorPropsForWidgetFromJsonDictionary(widget,options);
|
||||
}
|
||||
|
|
@ -1740,7 +1762,7 @@ void WidgetPropertiesReader0300::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* imageFileName = DICTOOL->getStringValue_json(imageFileNameDic, "path");
|
||||
slider->loadBarTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadBarTexture(imageFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1766,7 +1788,7 @@ void WidgetPropertiesReader0300::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char*imageFileName = DICTOOL->getStringValue_json(imageFileNameDic, "path");
|
||||
slider->loadBarTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadBarTexture(imageFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1790,7 +1812,7 @@ void WidgetPropertiesReader0300::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* normalFileName = DICTOOL->getStringValue_json(normalDic, "path");
|
||||
slider->loadSlidBallTextureNormal(normalFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadSlidBallTextureNormal(normalFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1812,7 +1834,7 @@ void WidgetPropertiesReader0300::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* pressedFileName = DICTOOL->getStringValue_json(pressedDic, "path");
|
||||
slider->loadSlidBallTexturePressed(pressedFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadSlidBallTexturePressed(pressedFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1834,7 +1856,7 @@ void WidgetPropertiesReader0300::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* disabledFileName = DICTOOL->getStringValue_json(disabledDic, "path");
|
||||
slider->loadSlidBallTextureDisabled(disabledFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadSlidBallTextureDisabled(disabledFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1858,7 +1880,7 @@ void WidgetPropertiesReader0300::setPropsForSliderFromJsonDictionary(Widget*widg
|
|||
case 1:
|
||||
{
|
||||
const char* imageFileName = DICTOOL->getStringValue_json(progressBarDic, "path");
|
||||
slider->loadProgressBarTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
slider->loadProgressBarTexture(imageFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1941,7 +1963,7 @@ void WidgetPropertiesReader0300::setPropsForLoadingBarFromJsonDictionary(Widget
|
|||
case 1:
|
||||
{
|
||||
const char* imageFileName = DICTOOL->getStringValue_json(imageFileNameDic, "path");
|
||||
loadingBar->loadTexture(imageFileName,UI_TEX_TYPE_PLIST);
|
||||
loadingBar->loadTexture(imageFileName,TextureResType::PLIST);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -1967,7 +1989,7 @@ void WidgetPropertiesReader0300::setPropsForLoadingBarFromJsonDictionary(Widget
|
|||
}
|
||||
/**/
|
||||
|
||||
loadingBar->setDirection(LoadingBarType(DICTOOL->getIntValue_json(options, "direction")));
|
||||
loadingBar->setBarDirection(LoadingBar::Direction(DICTOOL->getIntValue_json(options, "direction")));
|
||||
loadingBar->setPercent(DICTOOL->getIntValue_json(options, "percent"));
|
||||
setColorPropsForWidgetFromJsonDictionary(widget,options);
|
||||
}
|
||||
|
|
@ -2018,9 +2040,9 @@ void WidgetPropertiesReader0300::setPropsForListViewFromJsonDictionary(Widget* w
|
|||
float innerHeight = DICTOOL->getFloatValue_json(options, "innerHeight");
|
||||
listView->setInnerContainerSize(Size(innerWidth, innerHeight));
|
||||
int direction = DICTOOL->getFloatValue_json(options, "direction");
|
||||
listView->setDirection((SCROLLVIEW_DIR)direction);
|
||||
listView->setDirection((ScrollView::Direction)direction);
|
||||
|
||||
ListViewGravity gravity = (ListViewGravity)DICTOOL->getIntValue_json(options, "gravity");
|
||||
ListView::Gravity gravity = (ListView::Gravity)DICTOOL->getIntValue_json(options, "gravity");
|
||||
listView->setGravity(gravity);
|
||||
|
||||
float itemMargin = DICTOOL->getFloatValue_json(options, "itemMargin");
|
||||
|
|
|
|||
|
|
@ -91,6 +91,9 @@ public:
|
|||
virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
|
||||
cocos2d::ui::Widget* widget,
|
||||
const rapidjson::Value& customOptions) = 0;
|
||||
protected:
|
||||
void setAnchorPointForWidget(cocos2d::ui::Widget* widget, const rapidjson::Value&options);
|
||||
|
||||
protected:
|
||||
std::string m_strFilePath;
|
||||
};
|
||||
|
|
@ -160,6 +163,8 @@ public:
|
|||
virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
|
||||
cocos2d::ui::Widget* widget,
|
||||
const rapidjson::Value& customOptions);
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ void Skin::draw(Renderer *renderer, const Matrix &transform, bool transformUpdat
|
|||
Matrix mv = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
|
||||
|
||||
//TODO implement z order
|
||||
_quadCommand.init(_globalZOrder, _texture->getName(), _shaderProgram, _blendFunc, &_quad, 1, mv);
|
||||
_quadCommand.init(_globalZOrder, _texture->getName(), getGLProgramState(), _blendFunc, &_quad, 1, mv);
|
||||
renderer->addCommand(&_quadCommand);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,22 +48,22 @@ namespace cocostudio
|
|||
|
||||
const rapidjson::Value& normalDic = DICTOOL->getSubDictionary_json(options, "normalData");
|
||||
int normalType = DICTOOL->getIntValue_json(normalDic, "resourceType");
|
||||
std::string normalTexturePath = this->getResourcePath(normalDic, "path", (TextureResType)normalType);
|
||||
button->loadTextureNormal(normalTexturePath, (TextureResType)normalType);
|
||||
std::string normalTexturePath = this->getResourcePath(normalDic, "path", (Widget::TextureResType)normalType);
|
||||
button->loadTextureNormal(normalTexturePath, (Widget::TextureResType)normalType);
|
||||
|
||||
|
||||
const rapidjson::Value& pressedDic = DICTOOL->getSubDictionary_json(options, "pressedData");
|
||||
int pressedType = DICTOOL->getIntValue_json(pressedDic, "resourceType");
|
||||
|
||||
std::string pressedTexturePath = this->getResourcePath(pressedDic, "path", (TextureResType)pressedType);
|
||||
button->loadTexturePressed(pressedTexturePath, (TextureResType)pressedType);
|
||||
std::string pressedTexturePath = this->getResourcePath(pressedDic, "path", (Widget::TextureResType)pressedType);
|
||||
button->loadTexturePressed(pressedTexturePath, (Widget::TextureResType)pressedType);
|
||||
|
||||
|
||||
const rapidjson::Value& disabledDic = DICTOOL->getSubDictionary_json(options, "disabledData");
|
||||
int disabledType = DICTOOL->getIntValue_json(disabledDic, "resourceType");
|
||||
|
||||
std::string disabledTexturePath = this->getResourcePath(disabledDic, "path", (TextureResType)disabledType);
|
||||
button->loadTextureDisabled(disabledTexturePath, (TextureResType)disabledType);
|
||||
std::string disabledTexturePath = this->getResourcePath(disabledDic, "path", (Widget::TextureResType)disabledType);
|
||||
button->loadTextureDisabled(disabledTexturePath, (Widget::TextureResType)disabledType);
|
||||
|
||||
if (scale9Enable)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,32 +41,32 @@ namespace cocostudio
|
|||
//load background image
|
||||
const rapidjson::Value& backGroundDic = DICTOOL->getSubDictionary_json(options, "backGroundBoxData");
|
||||
int backGroundType = DICTOOL->getIntValue_json(backGroundDic, "resourceType");
|
||||
std::string backGroundTexturePath = this->getResourcePath(backGroundDic, "path", (TextureResType)backGroundType);
|
||||
checkBox->loadTextureBackGround(backGroundTexturePath, (TextureResType)backGroundType);
|
||||
std::string backGroundTexturePath = this->getResourcePath(backGroundDic, "path", (Widget::TextureResType)backGroundType);
|
||||
checkBox->loadTextureBackGround(backGroundTexturePath, (Widget::TextureResType)backGroundType);
|
||||
|
||||
//load background selected image
|
||||
const rapidjson::Value& backGroundSelectedDic = DICTOOL->getSubDictionary_json(options, "backGroundBoxSelectedData");
|
||||
int backGroundSelectedType = DICTOOL->getIntValue_json(backGroundSelectedDic, "resourceType");
|
||||
std::string backGroundSelectedTexturePath = this->getResourcePath(backGroundSelectedDic, "path", (TextureResType)backGroundSelectedType);
|
||||
checkBox->loadTextureBackGroundSelected(backGroundSelectedTexturePath, (TextureResType)backGroundSelectedType);
|
||||
std::string backGroundSelectedTexturePath = this->getResourcePath(backGroundSelectedDic, "path", (Widget::TextureResType)backGroundSelectedType);
|
||||
checkBox->loadTextureBackGroundSelected(backGroundSelectedTexturePath, (Widget::TextureResType)backGroundSelectedType);
|
||||
|
||||
//load frontCross image
|
||||
const rapidjson::Value& frontCrossDic = DICTOOL->getSubDictionary_json(options, "frontCrossData");
|
||||
int frontCrossType = DICTOOL->getIntValue_json(frontCrossDic, "resourceType");
|
||||
std::string frontCrossFileName = this->getResourcePath(frontCrossDic, "path", (TextureResType)frontCrossType);
|
||||
checkBox->loadTextureFrontCross(frontCrossFileName, (TextureResType)frontCrossType);
|
||||
std::string frontCrossFileName = this->getResourcePath(frontCrossDic, "path", (Widget::TextureResType)frontCrossType);
|
||||
checkBox->loadTextureFrontCross(frontCrossFileName, (Widget::TextureResType)frontCrossType);
|
||||
|
||||
//load backGroundBoxDisabledData
|
||||
const rapidjson::Value& backGroundDisabledDic = DICTOOL->getSubDictionary_json(options, "backGroundBoxDisabledData");
|
||||
int backGroundDisabledType = DICTOOL->getIntValue_json(backGroundDisabledDic, "resourceType");
|
||||
std::string backGroundDisabledFileName = this->getResourcePath(backGroundDisabledDic, "path", (TextureResType)backGroundDisabledType);
|
||||
checkBox->loadTextureBackGroundDisabled(backGroundDisabledFileName, (TextureResType)backGroundDisabledType);
|
||||
std::string backGroundDisabledFileName = this->getResourcePath(backGroundDisabledDic, "path", (Widget::TextureResType)backGroundDisabledType);
|
||||
checkBox->loadTextureBackGroundDisabled(backGroundDisabledFileName, (Widget::TextureResType)backGroundDisabledType);
|
||||
|
||||
///load frontCrossDisabledData
|
||||
const rapidjson::Value& frontCrossDisabledDic = DICTOOL->getSubDictionary_json(options, "frontCrossDisabledData");
|
||||
int frontCrossDisabledType = DICTOOL->getIntValue_json(frontCrossDisabledDic, "resourceType");
|
||||
std::string frontCrossDisabledFileName = this->getResourcePath(frontCrossDisabledDic, "path", (TextureResType)frontCrossDisabledType);
|
||||
checkBox->loadTextureFrontCrossDisabled(frontCrossDisabledFileName, (TextureResType)frontCrossDisabledType);
|
||||
std::string frontCrossDisabledFileName = this->getResourcePath(frontCrossDisabledDic, "path", (Widget::TextureResType)frontCrossDisabledType);
|
||||
checkBox->loadTextureFrontCrossDisabled(frontCrossDisabledFileName, (Widget::TextureResType)frontCrossDisabledType);
|
||||
|
||||
|
||||
WidgetReader::setColorPropsFromJsonDictionary(widget, options);
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ namespace cocostudio
|
|||
|
||||
const rapidjson::Value& imageFileNameDic = DICTOOL->getSubDictionary_json(options, "fileNameData");
|
||||
int imageFileNameType = DICTOOL->getIntValue_json(imageFileNameDic, "resourceType");
|
||||
std::string imageFileName = this->getResourcePath(imageFileNameDic, "path", (TextureResType)imageFileNameType);
|
||||
imageView->loadTexture(imageFileName, (TextureResType)imageFileNameType);
|
||||
std::string imageFileName = this->getResourcePath(imageFileNameDic, "path", (Widget::TextureResType)imageFileNameType);
|
||||
imageView->loadTexture(imageFileName, (Widget::TextureResType)imageFileNameType);
|
||||
|
||||
|
||||
bool scale9EnableExist = DICTOOL->checkObjectExist_json(options, "scale9Enable");
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ namespace cocostudio
|
|||
int co = DICTOOL->getIntValue_json(options, "bgColorOpacity");
|
||||
|
||||
int colorType = DICTOOL->getIntValue_json(options, "colorType");
|
||||
panel->setBackGroundColorType(LayoutBackGroundColorType(colorType));
|
||||
panel->setBackGroundColorType(Layout::BackGroundColorType(colorType));
|
||||
panel->setBackGroundColor(Color3B(scr, scg, scb),Color3B(ecr, ecg, ecb));
|
||||
panel->setBackGroundColor(Color3B(cr, cg, cb));
|
||||
panel->setBackGroundColorOpacity(co);
|
||||
|
|
@ -85,8 +85,8 @@ namespace cocostudio
|
|||
|
||||
const rapidjson::Value& imageFileNameDic = DICTOOL->getSubDictionary_json(options, "backGroundImageData");
|
||||
int imageFileNameType = DICTOOL->getIntValue_json(imageFileNameDic, "resourceType");
|
||||
std::string imageFileName = this->getResourcePath(imageFileNameDic, "path", (TextureResType)imageFileNameType);
|
||||
panel->setBackGroundImage(imageFileName, (TextureResType)imageFileNameType);
|
||||
std::string imageFileName = this->getResourcePath(imageFileNameDic, "path", (Widget::TextureResType)imageFileNameType);
|
||||
panel->setBackGroundImage(imageFileName, (Widget::TextureResType)imageFileNameType);
|
||||
|
||||
|
||||
if (backGroundScale9Enable)
|
||||
|
|
@ -97,7 +97,7 @@ namespace cocostudio
|
|||
float ch = DICTOOL->getFloatValue_json(options, "capInsetsHeight");
|
||||
panel->setBackGroundImageCapInsets(Rect(cx, cy, cw, ch));
|
||||
}
|
||||
panel->setLayoutType((LayoutType)DICTOOL->getIntValue_json(options, "layoutType"));
|
||||
panel->setLayoutType((Layout::Type)DICTOOL->getIntValue_json(options, "layoutType"));
|
||||
|
||||
int bgimgcr = DICTOOL->getIntValue_json(options, "colorR");
|
||||
int bgimgcg = DICTOOL->getIntValue_json(options, "colorG");
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ namespace cocostudio
|
|||
ListView* listView = static_cast<ListView*>(widget);
|
||||
|
||||
int direction = DICTOOL->getFloatValue_json(options, "direction");
|
||||
listView->setDirection((SCROLLVIEW_DIR)direction);
|
||||
listView->setDirection((ScrollView::Direction)direction);
|
||||
|
||||
ListViewGravity gravity = (ListViewGravity)DICTOOL->getIntValue_json(options, "gravity");
|
||||
ListView::Gravity gravity = (ListView::Gravity)DICTOOL->getIntValue_json(options, "gravity");
|
||||
listView->setGravity(gravity);
|
||||
|
||||
float itemMargin = DICTOOL->getFloatValue_json(options, "itemMargin");
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ namespace cocostudio
|
|||
|
||||
const rapidjson::Value& imageFileNameDic = DICTOOL->getSubDictionary_json(options, "textureData");
|
||||
int imageFileNameType = DICTOOL->getIntValue_json(imageFileNameDic, "resourceType");
|
||||
std::string imageFileName = this->getResourcePath(imageFileNameDic, "path", (TextureResType)imageFileNameType);
|
||||
loadingBar->loadTexture(imageFileName, (TextureResType)imageFileNameType);
|
||||
std::string imageFileName = this->getResourcePath(imageFileNameDic, "path", (Widget::TextureResType)imageFileNameType);
|
||||
loadingBar->loadTexture(imageFileName, (Widget::TextureResType)imageFileNameType);
|
||||
|
||||
|
||||
/* gui mark add load bar scale9 parse */
|
||||
|
|
@ -63,7 +63,7 @@ namespace cocostudio
|
|||
}
|
||||
/**/
|
||||
|
||||
loadingBar->setDirection(LoadingBarType(DICTOOL->getIntValue_json(options, "direction")));
|
||||
loadingBar->setBarDirection(LoadingBar::Direction(DICTOOL->getIntValue_json(options, "direction")));
|
||||
loadingBar->setPercent(DICTOOL->getIntValue_json(options, "percent"));
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ namespace cocostudio
|
|||
float innerHeight = DICTOOL->getFloatValue_json(options, "innerHeight");
|
||||
scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
|
||||
int direction = DICTOOL->getFloatValue_json(options, "direction");
|
||||
scrollView->setDirection((SCROLLVIEW_DIR)direction);
|
||||
scrollView->setDirection((ScrollView::Direction)direction);
|
||||
scrollView->setBounceEnabled(DICTOOL->getBooleanValue_json(options, "bounceEnable"));
|
||||
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue