diff --git a/AUTHORS b/AUTHORS index a64d7c52c7..b477f8913e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -819,6 +819,7 @@ Developers: Fixed a bug that HTTPClient reports 2xx status codes as errors Added missing Text Font and Placeholder feature of EditBox for Mac platform HttpRequest uses std::function as callback + EditBox: mac secure input iSevenDays Fixed a bug that the result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG @@ -841,6 +842,8 @@ Developers: zifter Fixed a bug that the effect of particle loaded from CocosBuilder is incorrectly + Fix twice calling onExit + Fixed bug with cascade opacity and color for control button twhittock Fixed a bug that Application::run returns wrong value on Mac platform diff --git a/CHANGELOG b/CHANGELOG index a45554b14f..cf794a5e85 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,16 @@ -cocos2d-x-3.1-rc0 May.16 2014 +cocos2d-x-3.1-rc0 May.18 2014 + [NEW] Cocos2dxActivity: Adds a virtual method to load native libraries. + [NEW] Directory Structure: reorder some files within the cocos/ folder + [NEW] Sprite3D: a node that renders 3d models + [NEW] EditBox: support secure input on Mac + + [FIX] ControlButton: cascade opacity and color error + [FIX] Director: twice calling of onExit [FIX] Math: Vector2->Vec2, Vector3->Vec3, Vector4->Vec4, Matrix->Mat4 [FIX] GLProgram: uniform CC_Texture0 is pre-defined by cocos2d. MUST NOT be defined in shaders [FIX] GLProgramState: Supports multitexturing [FIX] Studio:ActionObject: correct TotalTime of ActionObject + [FIX] Studio: FrameData::copy doesn't copy `isTween` property cocos2d-x-3.1-alpha1 May.9 2014 [NEW] Animate: Dispatch a custom event after an animation frame is displayed diff --git a/CMakeLists.txt b/CMakeLists.txt index 20e616e368..2a3663eba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,6 +130,8 @@ endif() include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cocos + ${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/desktop + ${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/cocos/audio/include ${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support ${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/auto @@ -140,8 +142,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/external/unzip ${CMAKE_CURRENT_SOURCE_DIR}/external/edtaa3func ${CMAKE_CURRENT_SOURCE_DIR}/external/chipmunk/include/chipmunk - ${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/platform/desktop - ${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/platform/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/png/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/include/${PLATFORM_FOLDER} diff --git a/README.md b/README.md index e4b3a38b4b..4112f6aace 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ cocos2d-x ========= [![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.png?branch=v3)](https://travis-ci.org/cocos2d/cocos2d-x) -[![Build Status](https://travis-ci.org/cocos2d/cocos2d-x.png?branch=v3)](https://travis-ci.org/cocos-travis-mac/cocos2d-x) +[![Build Status](https://travis-ci.org/cocos-travis-mac/cocos2d-x.png?branch=v3)](https://travis-ci.org/cocos-travis-mac/cocos2d-x) [cocos2d-x][1] is a multi-platform framework for building 2d games, interactive books, demos and other graphical applications. It is based on [cocos2d-iphone][2], but instead of using Objective-C, it uses C++. @@ -18,7 +18,15 @@ cocos2d-x is: * Easy to use * Community Supported +Git user attention +----------------------- +1. After cloning the repo, please execute `download-deps.py` to download and install some dependences. + + $ cd cocos2d-x + $ python download-deps.py + +2. Please execute `download-deps.py` once you synchronize with this repo. If there aren't any updates, it will not download dependences again. How to start a new game ----------------------- diff --git a/build/android-build.py b/build/android-build.py index ebef60cbe5..7dcd4a6872 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -116,7 +116,7 @@ def do_build(cocos_root, ndk_root, app_android_root, ndk_build_param,sdk_root,an raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!") elif android_platform is not None: sdk_tool_path = os.path.join(sdk_root, "tools/android") - cocoslib_path = os.path.join(cocos_root, "cocos/2d/platform/android/java") + cocoslib_path = os.path.join(cocos_root, "cocos/platform/android/java") command = '%s update lib-project -t %s -p %s' % (sdk_tool_path,android_platform,cocoslib_path) if os.system(command) != 0: raise Exception("update cocos lib-project [ " + cocoslib_path + " ] fails!") diff --git a/build/cocos2d-wp8.vc2012.sln b/build/cocos2d-wp8.vc2012.sln index 44585fda87..1f3e8ba26c 100644 --- a/build/cocos2d-wp8.vc2012.sln +++ b/build/cocos2d-wp8.vc2012.sln @@ -1,5 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30324.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d_wp8.vcxproj", "{B5AF91B3-64EA-44E1-84B0-D759E93758FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}" @@ -44,6 +46,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-tests", "..\tests\cpp-t EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-testsComponent", "..\tests\cpp-tests\proj.wp8-xaml\cpp-testsComponent\cpp-testsComponent.vcxproj", "{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}" + ProjectSection(ProjectDependencies) = postProject + {271FEE84-9198-4C26-8567-4247C563B0B1} = {271FEE84-9198-4C26-8567-4247C563B0B1} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.wp8\libNetwork.vcxproj", "{7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}" ProjectSection(ProjectDependencies) = postProject @@ -58,13 +63,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-empty-test", "..\tests\ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-testComponent", "..\tests\cpp-empty-test\proj-wp8-xaml\cpp-empty-testComponent\cpp-empty-testComponent.vcxproj", "{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyTemplateFiles", "..\cocos\2d\platform\wp8-xaml\CopyTemplateFiles.vcxproj", "{271FEE84-9198-4C26-8567-4247C563B0B1}" ProjectSection(ProjectDependencies) = postProject - {5921FE12-7EF3-4847-8453-42EF286DDBE7} = {5921FE12-7EF3-4847-8453-42EF286DDBE7} - {60D53713-1675-4466-81DC-D67A031C3D21} = {60D53713-1675-4466-81DC-D67A031C3D21} - {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} - {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} + {271FEE84-9198-4C26-8567-4247C563B0B1} = {271FEE84-9198-4C26-8567-4247C563B0B1} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.wp8\libGUI.vcxproj", "{08FB23E4-1517-4EDC-B682-DA238CDAA83D}" @@ -72,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj. {B5AF91B3-64EA-44E1-84B0-D759E93758FB} = {B5AF91B3-64EA-44E1-84B0-D759E93758FB} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyTemplateFiles", "..\cocos\platform\wp8-xaml\CopyTemplateFiles.vcxproj", "{271FEE84-9198-4C26-8567-4247C563B0B1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -392,26 +394,6 @@ Global {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x64.ActiveCfg = Release|Win32 {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x86.ActiveCfg = Release|Win32 {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}.Release|x86.Build.0 = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.ActiveCfg = Debug|ARM - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.Build.0 = Debug|ARM - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.Build.0 = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x64.ActiveCfg = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.ActiveCfg = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.Build.0 = Debug|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Any CPU.ActiveCfg = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.ActiveCfg = Release|ARM - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.Build.0 = Release|ARM - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.Build.0 = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.ActiveCfg = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.Build.0 = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x64.ActiveCfg = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.ActiveCfg = Release|Win32 - {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.Build.0 = Release|Win32 {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|Any CPU.ActiveCfg = Debug|Win32 {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|ARM.ActiveCfg = Debug|ARM {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Debug|ARM.Build.0 = Debug|ARM @@ -432,6 +414,26 @@ Global {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x64.ActiveCfg = Release|Win32 {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x86.ActiveCfg = Release|Win32 {08FB23E4-1517-4EDC-B682-DA238CDAA83D}.Release|x86.Build.0 = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.ActiveCfg = Debug|ARM + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|ARM.Build.0 = Debug|ARM + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.ActiveCfg = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|Win32.Build.0 = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x64.ActiveCfg = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.ActiveCfg = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Debug|x86.Build.0 = Debug|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Any CPU.ActiveCfg = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.ActiveCfg = Release|ARM + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|ARM.Build.0 = Release|ARM + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Mixed Platforms.Build.0 = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.ActiveCfg = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|Win32.Build.0 = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x64.ActiveCfg = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.ActiveCfg = Release|Win32 + {271FEE84-9198-4C26-8567-4247C563B0B1}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 19972114db..d6dd743934 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -92,9 +92,6 @@ 1A087AE91860400400196EF5 /* edtaa3func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A087AE61860400400196EF5 /* edtaa3func.cpp */; }; 1A087AEA1860400400196EF5 /* edtaa3func.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A087AE71860400400196EF5 /* edtaa3func.h */; }; 1A087AEB1860400400196EF5 /* edtaa3func.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A087AE71860400400196EF5 /* edtaa3func.h */; }; - 1A0DB7321823827C0025743D /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0DB7301823827C0025743D /* CCGL.h */; }; - 1A0DB7331823827C0025743D /* CCEAGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0DB7311823827C0025743D /* CCEAGLView.h */; }; - 1A0DB7381823828F0025743D /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0DB7351823828F0025743D /* CCGL.h */; }; 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 */; }; @@ -278,10 +275,6 @@ 1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57021F180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp */; }; 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */; }; 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */; }; - 1A570234180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */; }; - 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 */; }; 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 */; }; @@ -306,38 +299,10 @@ 1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570290180BCCAB0088DEC7 /* CCAnimationCache.cpp */; }; 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570291180BCCAB0088DEC7 /* CCAnimationCache.h */; }; 1A570299180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570291180BCCAB0088DEC7 /* CCAnimationCache.h */; }; - 1A5702AF180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */; }; - 1A5702B0180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */; }; - 1A5702B1180BCDBC0088DEC7 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */; }; - 1A5702B2180BCDBC0088DEC7 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */; }; - 1A5702B5180BCDF40088DEC7 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */; }; - 1A5702B6180BCDF40088DEC7 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */; }; - 1A5702B7180BCDF40088DEC7 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B4180BCDF40088DEC7 /* CCVertex.h */; }; - 1A5702B8180BCDF40088DEC7 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B4180BCDF40088DEC7 /* CCVertex.h */; }; - 1A5702BA180BCDFC0088DEC7 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */; }; - 1A5702BB180BCDFC0088DEC7 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */; }; - 1A5702C0180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */; }; - 1A5702C1180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */; }; - 1A5702C2180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */; }; - 1A5702C3180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */; }; - 1A5702C4180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */; }; - 1A5702C5180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */; }; 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */; }; 1A5702C9180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */; }; 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */; }; 1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */; }; - 1A5702D3180BCE570088DEC7 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */; }; - 1A5702D4180BCE570088DEC7 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */; }; - 1A5702D5180BCE570088DEC7 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */; }; - 1A5702D6180BCE570088DEC7 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */; }; - 1A5702D7180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */; }; - 1A5702D8180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */; }; - 1A5702D9180BCE570088DEC7 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */; }; - 1A5702DA180BCE570088DEC7 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */; }; - 1A5702DB180BCE570088DEC7 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */; }; - 1A5702DC180BCE570088DEC7 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */; }; - 1A5702DD180BCE570088DEC7 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */; }; - 1A5702DE180BCE570088DEC7 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */; }; 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702E0180BCE750088DEC7 /* CCTileMapAtlas.cpp */; }; 1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702E0180BCE750088DEC7 /* CCTileMapAtlas.cpp */; }; 1A5702EC180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702E1180BCE750088DEC7 /* CCTileMapAtlas.h */; }; @@ -362,8 +327,6 @@ 1A570301180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702FE180BCE890088DEC7 /* CCParallaxNode.cpp */; }; 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702FF180BCE890088DEC7 /* CCParallaxNode.h */; }; 1A570303180BCE890088DEC7 /* CCParallaxNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702FF180BCE890088DEC7 /* CCParallaxNode.h */; }; - 1A570305180BCED90088DEC7 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570304180BCED90088DEC7 /* ccUtils.cpp */; }; - 1A570306180BCED90088DEC7 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570304180BCED90088DEC7 /* ccUtils.cpp */; }; 1A57030C180BCF190088DEC7 /* CCComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570308180BCF190088DEC7 /* CCComponent.cpp */; }; 1A57030D180BCF190088DEC7 /* CCComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570308180BCF190088DEC7 /* CCComponent.cpp */; }; 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570309180BCF190088DEC7 /* CCComponent.h */; }; @@ -372,26 +335,6 @@ 1A570311180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */; }; 1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */; }; 1A570313180BCF190088DEC7 /* CCComponentContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */; }; - 1A570319180BCF430088DEC7 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570315180BCF430088DEC7 /* ccCArray.cpp */; }; - 1A57031A180BCF430088DEC7 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570315180BCF430088DEC7 /* ccCArray.cpp */; }; - 1A57031B180BCF430088DEC7 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570316180BCF430088DEC7 /* ccCArray.h */; }; - 1A57031C180BCF430088DEC7 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570316180BCF430088DEC7 /* ccCArray.h */; }; - 1A57031D180BCF430088DEC7 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570317180BCF430088DEC7 /* uthash.h */; }; - 1A57031E180BCF430088DEC7 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570317180BCF430088DEC7 /* uthash.h */; }; - 1A57031F180BCF430088DEC7 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570318180BCF430088DEC7 /* utlist.h */; }; - 1A570320180BCF430088DEC7 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570318180BCF430088DEC7 /* utlist.h */; }; - 1A570324180BCF660088DEC7 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570322180BCF660088DEC7 /* TGAlib.cpp */; }; - 1A570325180BCF660088DEC7 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570322180BCF660088DEC7 /* TGAlib.cpp */; }; - 1A570326180BCF660088DEC7 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570323180BCF660088DEC7 /* TGAlib.h */; }; - 1A570327180BCF660088DEC7 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570323180BCF660088DEC7 /* TGAlib.h */; }; - 1A57032F180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */; }; - 1A570330180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */; }; - 1A570331180BCFD50088DEC7 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */; }; - 1A570332180BCFD50088DEC7 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */; }; - 1A570333180BCFD50088DEC7 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */; }; - 1A570334180BCFD50088DEC7 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */; }; - 1A570335180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */; }; - 1A570336180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */; }; 1A570347180BD0850088DEC7 /* libglfw3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A570346180BD0850088DEC7 /* libglfw3.a */; }; 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570349180BD09B0088DEC7 /* tinyxml2.cpp */; }; 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570349180BD09B0088DEC7 /* tinyxml2.cpp */; }; @@ -542,18 +485,10 @@ 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; 1A8C5A10180E930E00EF57C3 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; 1A94D35116C2072800D79D09 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; - 1A9DCA23180E6955007A3AD4 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */; }; - 1A9DCA24180E6955007A3AD4 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */; }; - 1A9DCA25180E6955007A3AD4 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */; }; - 1A9DCA26180E6955007A3AD4 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */; }; 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */; }; 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */; }; 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */; }; 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */; }; - 1A9DCA2D180E6955007A3AD4 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */; }; - 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 */; }; 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 */; }; @@ -1039,19 +974,11 @@ 2905FA8D18CF08D100240AA3 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; 2905FA8E18CF08D100240AA3 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; - 2928C2001923756F00E77353 /* UILayoutExecutant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2928C1FE1923756F00E77353 /* UILayoutExecutant.cpp */; }; - 2928C2011923756F00E77353 /* UILayoutExecutant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2928C1FE1923756F00E77353 /* UILayoutExecutant.cpp */; }; - 2928C2021923756F00E77353 /* UILayoutExecutant.h in Headers */ = {isa = PBXBuildFile; fileRef = 2928C1FF1923756F00E77353 /* UILayoutExecutant.h */; }; - 2928C2031923756F00E77353 /* UILayoutExecutant.h in Headers */ = {isa = PBXBuildFile; fileRef = 2928C1FF1923756F00E77353 /* UILayoutExecutant.h */; }; - 296CAD221915EC8000C64FBF /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */; }; - 296CAD231915EC8000C64FBF /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */; }; - 296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD211915EC8000C64FBF /* CCEventFocus.h */; }; - 296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD211915EC8000C64FBF /* CCEventFocus.h */; }; - 296CAD281915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */; }; - 296CAD291915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */; }; - 296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */; }; - 296CAD2B1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */; }; 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; }; + 29CB8F4C1929D1BB00C841D6 /* UILayoutExecutant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutExecutant.cpp */; }; + 29CB8F4D1929D1BB00C841D6 /* UILayoutExecutant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutExecutant.cpp */; }; + 29CB8F4E1929D1BB00C841D6 /* UILayoutExecutant.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutExecutant.h */; }; + 29CB8F4F1929D1BB00C841D6 /* UILayoutExecutant.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutExecutant.h */; }; 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; @@ -1070,9 +997,6 @@ 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; 373B9129187891F400198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; 373B912A187891FB00198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; - 3E26D40518ACB5D100834404 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40418ACB5D100834404 /* CCImage.cpp */; }; - 3E26D40618ACB5D100834404 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40418ACB5D100834404 /* CCImage.cpp */; }; - 3E26D40818ACB63900834404 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40718ACB63900834404 /* CCDevice.mm */; }; 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; 460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; @@ -1191,61 +1115,6 @@ 46A160591807A5EB005B8026 /* SimpleAudioEngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A15FEB1807A56F005B8026 /* SimpleAudioEngine.mm */; }; 46A1605A1807A5EB005B8026 /* SimpleAudioEngine_objc.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FEC1807A56F005B8026 /* SimpleAudioEngine_objc.h */; }; 46A1605B1807A5EB005B8026 /* SimpleAudioEngine_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A15FED1807A56F005B8026 /* SimpleAudioEngine_objc.m */; }; - 46A170131807CBFC005B8026 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */; }; - 46A170141807CBFC005B8026 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */; }; - 46A170151807CBFC005B8026 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A911807B038005B8026 /* CCLock.cpp */; }; - 46A170161807CBFC005B8026 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A921807B038005B8026 /* CCLock.h */; }; - 46A170171807CBFC005B8026 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A931807B038005B8026 /* CCThread.mm */; }; - 46A170181807CBFC005B8026 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A941807B038005B8026 /* CCApplicationProtocol.h */; }; - 46A170191807CBFC005B8026 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A951807B038005B8026 /* CCCommon.h */; }; - 46A1701A1807CBFC005B8026 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A961807B038005B8026 /* CCDevice.h */; }; - 46A1701B1807CBFC005B8026 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */; }; - 46A1701C1807CBFC005B8026 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A981807B038005B8026 /* CCGLViewProtocol.h */; }; - 46A1701D1807CBFC005B8026 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A991807B038005B8026 /* CCFileUtils.cpp */; }; - 46A1701E1807CBFC005B8026 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9A1807B038005B8026 /* CCFileUtils.h */; }; - 46A1701F1807CBFC005B8026 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9B1807B038005B8026 /* CCImage.h */; }; - 46A170231807CBFC005B8026 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */; }; - 46A170241807CBFC005B8026 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA01807B038005B8026 /* CCSAXParser.h */; }; - 46A170251807CBFC005B8026 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA11807B038005B8026 /* CCThread.cpp */; }; - 46A170261807CBFC005B8026 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA21807B038005B8026 /* CCThread.h */; }; - 46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */; }; - 46A170281807CBFE005B8026 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */; }; - 46A170291807CBFE005B8026 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A911807B038005B8026 /* CCLock.cpp */; }; - 46A1702A1807CBFE005B8026 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A921807B038005B8026 /* CCLock.h */; }; - 46A1702B1807CBFE005B8026 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A931807B038005B8026 /* CCThread.mm */; }; - 46A1702C1807CBFE005B8026 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A941807B038005B8026 /* CCApplicationProtocol.h */; }; - 46A1702D1807CBFE005B8026 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A951807B038005B8026 /* CCCommon.h */; }; - 46A1702E1807CBFE005B8026 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A961807B038005B8026 /* CCDevice.h */; }; - 46A1702F1807CBFE005B8026 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */; }; - 46A170301807CBFE005B8026 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A981807B038005B8026 /* CCGLViewProtocol.h */; }; - 46A170311807CBFE005B8026 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A991807B038005B8026 /* CCFileUtils.cpp */; }; - 46A170321807CBFE005B8026 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9A1807B038005B8026 /* CCFileUtils.h */; }; - 46A170331807CBFE005B8026 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9B1807B038005B8026 /* CCImage.h */; }; - 46A170371807CBFE005B8026 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */; }; - 46A170381807CBFE005B8026 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA01807B038005B8026 /* CCSAXParser.h */; }; - 46A170391807CBFE005B8026 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA11807B038005B8026 /* CCThread.cpp */; }; - 46A1703A1807CBFE005B8026 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA21807B038005B8026 /* CCThread.h */; }; - 46A1703B1807CC07005B8026 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA41807B038005B8026 /* CCApplication.h */; }; - 46A1703C1807CC07005B8026 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA51807B038005B8026 /* CCApplication.mm */; }; - 46A1703D1807CC07005B8026 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA61807B038005B8026 /* CCCommon.mm */; }; - 46A1703E1807CC07005B8026 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA71807B038005B8026 /* CCDevice.mm */; }; - 46A1703F1807CC07005B8026 /* CCDirectorCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA81807B038005B8026 /* CCDirectorCaller.h */; }; - 46A170401807CC07005B8026 /* CCDirectorCaller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA91807B038005B8026 /* CCDirectorCaller.mm */; }; - 46A170411807CC07005B8026 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AAA1807B038005B8026 /* CCGLView.h */; }; - 46A170421807CC07005B8026 /* CCGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AAB1807B038005B8026 /* CCGLView.mm */; }; - 46A170431807CC07005B8026 /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AAC1807B038005B8026 /* CCES2Renderer.h */; }; - 46A170441807CC07005B8026 /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AAD1807B038005B8026 /* CCES2Renderer.m */; }; - 46A170451807CC07005B8026 /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AAE1807B038005B8026 /* CCESRenderer.h */; }; - 46A170471807CC07005B8026 /* CCImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AB01807B038005B8026 /* CCImage.mm */; }; - 46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AB11807B038005B8026 /* CCPlatformDefine.h */; }; - 46A170491807CC07005B8026 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AB21807B038005B8026 /* CCStdC.h */; }; - 46A1704B1807CC07005B8026 /* CCEAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AB41807B038005B8026 /* CCEAGLView.mm */; }; - 46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AB51807B038005B8026 /* OpenGL_Internal.h */; }; - 46A1704F1807CC1C005B8026 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AC81807B038005B8026 /* CCApplication.h */; }; - 46A170501807CC1C005B8026 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AC91807B038005B8026 /* CCApplication.mm */; }; - 46A170511807CC1C005B8026 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16ACA1807B038005B8026 /* CCCommon.mm */; }; - 46A1705B1807CC1C005B8026 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AD41807B038005B8026 /* CCPlatformDefine.h */; }; - 46A1705C1807CC1C005B8026 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AD51807B038005B8026 /* CCStdC.h */; }; 46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1706E1807CE7A005B8026 /* CCPhysicsBody.cpp */; }; 46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1706F1807CE7A005B8026 /* CCPhysicsBody.h */; }; 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170701807CE7A005B8026 /* CCPhysicsContact.cpp */; }; @@ -1380,198 +1249,10 @@ 46C02E0818E91123004B7456 /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = 46C02E0518E91123004B7456 /* xxhash.c */; }; 46C02E0918E91123004B7456 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C02E0618E91123004B7456 /* xxhash.h */; }; 46C02E0A18E91123004B7456 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C02E0618E91123004B7456 /* xxhash.h */; }; - 500DC8AA19105D41007B91BF /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89919105D41007B91BF /* CCBatchCommand.cpp */; }; - 500DC8AB19105D41007B91BF /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89919105D41007B91BF /* CCBatchCommand.cpp */; }; - 500DC8AC19105D41007B91BF /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89A19105D41007B91BF /* CCBatchCommand.h */; }; - 500DC8AD19105D41007B91BF /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89A19105D41007B91BF /* CCBatchCommand.h */; }; - 500DC8AE19105D41007B91BF /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */; }; - 500DC8AF19105D41007B91BF /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */; }; - 500DC8B019105D41007B91BF /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89C19105D41007B91BF /* CCCustomCommand.h */; }; - 500DC8B119105D41007B91BF /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89C19105D41007B91BF /* CCCustomCommand.h */; }; - 500DC8B219105D41007B91BF /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */; }; - 500DC8B319105D41007B91BF /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */; }; - 500DC8B419105D41007B91BF /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89E19105D41007B91BF /* CCGroupCommand.h */; }; - 500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89E19105D41007B91BF /* CCGroupCommand.h */; }; - 500DC8BA19105D41007B91BF /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */; }; - 500DC8BB19105D41007B91BF /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */; }; - 500DC8BC19105D41007B91BF /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A219105D41007B91BF /* CCQuadCommand.h */; }; - 500DC8BD19105D41007B91BF /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A219105D41007B91BF /* CCQuadCommand.h */; }; - 500DC8BE19105D41007B91BF /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */; }; - 500DC8BF19105D41007B91BF /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */; }; - 500DC8C019105D41007B91BF /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A419105D41007B91BF /* CCRenderCommand.h */; }; - 500DC8C119105D41007B91BF /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A419105D41007B91BF /* CCRenderCommand.h */; }; - 500DC8C219105D41007B91BF /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */; }; - 500DC8C319105D41007B91BF /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */; }; - 500DC8C419105D41007B91BF /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A619105D41007B91BF /* CCRenderer.cpp */; }; - 500DC8C519105D41007B91BF /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A619105D41007B91BF /* CCRenderer.cpp */; }; - 500DC8C619105D41007B91BF /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A719105D41007B91BF /* CCRenderer.h */; }; - 500DC8C719105D41007B91BF /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A719105D41007B91BF /* CCRenderer.h */; }; - 500DC8D119105F7D007B91BF /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */; }; - 500DC8D219105F7D007B91BF /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */; }; - 500DC8D319105F7D007B91BF /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */; }; - 500DC8D419105F7D007B91BF /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */; }; - 500DC8D519105F7D007B91BF /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */; }; - 500DC8D619105F7D007B91BF /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */; }; - 500DC8D719105F7D007B91BF /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CF19105F7D007B91BF /* CCGeometry.h */; }; - 500DC8D819105F7D007B91BF /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CF19105F7D007B91BF /* CCGeometry.h */; }; - 500DC8D919105F7D007B91BF /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8D019105F7D007B91BF /* CCMathBase.h */; }; - 500DC8DA19105F7D007B91BF /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8D019105F7D007B91BF /* CCMathBase.h */; }; - 500DC92A19106300007B91BF /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E719106300007B91BF /* atitc.cpp */; }; - 500DC92B19106300007B91BF /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E719106300007B91BF /* atitc.cpp */; }; - 500DC92C19106300007B91BF /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8E819106300007B91BF /* atitc.h */; }; - 500DC92D19106300007B91BF /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8E819106300007B91BF /* atitc.h */; }; - 500DC92E19106300007B91BF /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E919106300007B91BF /* base64.cpp */; }; - 500DC92F19106300007B91BF /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E919106300007B91BF /* base64.cpp */; }; - 500DC93019106300007B91BF /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EA19106300007B91BF /* base64.h */; }; - 500DC93119106300007B91BF /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EA19106300007B91BF /* base64.h */; }; - 500DC93219106300007B91BF /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */; }; - 500DC93319106300007B91BF /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */; }; - 500DC93419106300007B91BF /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */; }; - 500DC93519106300007B91BF /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */; }; - 500DC93619106300007B91BF /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8ED19106300007B91BF /* ccConfig.h */; }; - 500DC93719106300007B91BF /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8ED19106300007B91BF /* ccConfig.h */; }; - 500DC93819106300007B91BF /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EE19106300007B91BF /* CCConfiguration.cpp */; }; - 500DC93919106300007B91BF /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EE19106300007B91BF /* CCConfiguration.cpp */; }; - 500DC93A19106300007B91BF /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EF19106300007B91BF /* CCConfiguration.h */; }; - 500DC93B19106300007B91BF /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EF19106300007B91BF /* CCConfiguration.h */; }; - 500DC93C19106300007B91BF /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F019106300007B91BF /* CCConsole.cpp */; }; - 500DC93D19106300007B91BF /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F019106300007B91BF /* CCConsole.cpp */; }; - 500DC93E19106300007B91BF /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F119106300007B91BF /* CCConsole.h */; }; - 500DC93F19106300007B91BF /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F119106300007B91BF /* CCConsole.h */; }; - 500DC94019106300007B91BF /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F219106300007B91BF /* CCData.cpp */; }; - 500DC94119106300007B91BF /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F219106300007B91BF /* CCData.cpp */; }; - 500DC94219106300007B91BF /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F319106300007B91BF /* CCData.h */; }; - 500DC94319106300007B91BF /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F319106300007B91BF /* CCData.h */; }; - 500DC94419106300007B91BF /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F419106300007B91BF /* CCDataVisitor.cpp */; }; - 500DC94519106300007B91BF /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F419106300007B91BF /* CCDataVisitor.cpp */; }; - 500DC94619106300007B91BF /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F519106300007B91BF /* CCDataVisitor.h */; }; - 500DC94719106300007B91BF /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F519106300007B91BF /* CCDataVisitor.h */; }; - 500DC94819106300007B91BF /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F619106300007B91BF /* CCDirector.cpp */; }; - 500DC94919106300007B91BF /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F619106300007B91BF /* CCDirector.cpp */; }; - 500DC94A19106300007B91BF /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F719106300007B91BF /* CCDirector.h */; }; - 500DC94B19106300007B91BF /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F719106300007B91BF /* CCDirector.h */; }; - 500DC94C19106300007B91BF /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F819106300007B91BF /* CCEvent.cpp */; }; - 500DC94D19106300007B91BF /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F819106300007B91BF /* CCEvent.cpp */; }; - 500DC94E19106300007B91BF /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F919106300007B91BF /* CCEvent.h */; }; - 500DC94F19106300007B91BF /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F919106300007B91BF /* CCEvent.h */; }; - 500DC95019106300007B91BF /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */; }; - 500DC95119106300007B91BF /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */; }; - 500DC95219106300007B91BF /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FB19106300007B91BF /* CCEventAcceleration.h */; }; - 500DC95319106300007B91BF /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FB19106300007B91BF /* CCEventAcceleration.h */; }; - 500DC95419106300007B91BF /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FC19106300007B91BF /* CCEventCustom.cpp */; }; - 500DC95519106300007B91BF /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FC19106300007B91BF /* CCEventCustom.cpp */; }; - 500DC95619106300007B91BF /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FD19106300007B91BF /* CCEventCustom.h */; }; - 500DC95719106300007B91BF /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FD19106300007B91BF /* CCEventCustom.h */; }; - 500DC95819106300007B91BF /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */; }; - 500DC95919106300007B91BF /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */; }; - 500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FF19106300007B91BF /* CCEventDispatcher.h */; }; - 500DC95B19106300007B91BF /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FF19106300007B91BF /* CCEventDispatcher.h */; }; - 500DC95C19106300007B91BF /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90019106300007B91BF /* CCEventKeyboard.cpp */; }; - 500DC95D19106300007B91BF /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90019106300007B91BF /* CCEventKeyboard.cpp */; }; - 500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90119106300007B91BF /* CCEventKeyboard.h */; }; - 500DC95F19106300007B91BF /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90119106300007B91BF /* CCEventKeyboard.h */; }; - 500DC96019106300007B91BF /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90219106300007B91BF /* CCEventListener.cpp */; }; - 500DC96119106300007B91BF /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90219106300007B91BF /* CCEventListener.cpp */; }; - 500DC96219106300007B91BF /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90319106300007B91BF /* CCEventListener.h */; }; - 500DC96319106300007B91BF /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90319106300007B91BF /* CCEventListener.h */; }; - 500DC96419106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */; }; - 500DC96519106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */; }; - 500DC96619106300007B91BF /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */; }; - 500DC96719106300007B91BF /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */; }; - 500DC96819106300007B91BF /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */; }; - 500DC96919106300007B91BF /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */; }; - 500DC96A19106300007B91BF /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90719106300007B91BF /* CCEventListenerCustom.h */; }; - 500DC96B19106300007B91BF /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90719106300007B91BF /* CCEventListenerCustom.h */; }; - 500DC96C19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */; }; - 500DC96D19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */; }; - 500DC96E19106300007B91BF /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */; }; - 500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */; }; - 500DC97019106300007B91BF /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */; }; - 500DC97119106300007B91BF /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */; }; - 500DC97219106300007B91BF /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90B19106300007B91BF /* CCEventListenerMouse.h */; }; - 500DC97319106300007B91BF /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90B19106300007B91BF /* CCEventListenerMouse.h */; }; - 500DC97419106300007B91BF /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */; }; - 500DC97519106300007B91BF /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */; }; - 500DC97619106300007B91BF /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90D19106300007B91BF /* CCEventListenerTouch.h */; }; - 500DC97719106300007B91BF /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90D19106300007B91BF /* CCEventListenerTouch.h */; }; - 500DC97819106300007B91BF /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90E19106300007B91BF /* CCEventMouse.cpp */; }; - 500DC97919106300007B91BF /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90E19106300007B91BF /* CCEventMouse.cpp */; }; - 500DC97A19106300007B91BF /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90F19106300007B91BF /* CCEventMouse.h */; }; - 500DC97B19106300007B91BF /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90F19106300007B91BF /* CCEventMouse.h */; }; - 500DC97C19106300007B91BF /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91019106300007B91BF /* CCEventTouch.cpp */; }; - 500DC97D19106300007B91BF /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91019106300007B91BF /* CCEventTouch.cpp */; }; - 500DC97E19106300007B91BF /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91119106300007B91BF /* CCEventTouch.h */; }; - 500DC97F19106300007B91BF /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91119106300007B91BF /* CCEventTouch.h */; }; - 500DC98019106300007B91BF /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91219106300007B91BF /* CCEventType.h */; }; - 500DC98119106300007B91BF /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91219106300007B91BF /* CCEventType.h */; }; - 500DC98219106300007B91BF /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91319106300007B91BF /* ccMacros.h */; }; - 500DC98319106300007B91BF /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91319106300007B91BF /* ccMacros.h */; }; - 500DC98419106300007B91BF /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91419106300007B91BF /* CCMap.h */; }; - 500DC98519106300007B91BF /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91419106300007B91BF /* CCMap.h */; }; - 500DC98619106300007B91BF /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91519106300007B91BF /* CCNS.cpp */; }; - 500DC98719106300007B91BF /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91519106300007B91BF /* CCNS.cpp */; }; - 500DC98819106300007B91BF /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91619106300007B91BF /* CCNS.h */; }; - 500DC98919106300007B91BF /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91619106300007B91BF /* CCNS.h */; }; - 500DC98A19106300007B91BF /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91719106300007B91BF /* CCPlatformConfig.h */; }; - 500DC98B19106300007B91BF /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91719106300007B91BF /* CCPlatformConfig.h */; }; - 500DC98C19106300007B91BF /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91819106300007B91BF /* CCPlatformMacros.h */; }; - 500DC98D19106300007B91BF /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91819106300007B91BF /* CCPlatformMacros.h */; }; - 500DC98E19106300007B91BF /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91919106300007B91BF /* CCRef.cpp */; }; - 500DC98F19106300007B91BF /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91919106300007B91BF /* CCRef.cpp */; }; - 500DC99019106300007B91BF /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91A19106300007B91BF /* CCRef.h */; }; - 500DC99119106300007B91BF /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91A19106300007B91BF /* CCRef.h */; }; - 500DC99219106300007B91BF /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91B19106300007B91BF /* CCRefPtr.h */; }; - 500DC99319106300007B91BF /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91B19106300007B91BF /* CCRefPtr.h */; }; - 500DC99419106300007B91BF /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91C19106300007B91BF /* CCScheduler.cpp */; }; - 500DC99519106300007B91BF /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91C19106300007B91BF /* CCScheduler.cpp */; }; - 500DC99619106300007B91BF /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91D19106300007B91BF /* CCScheduler.h */; }; - 500DC99719106300007B91BF /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91D19106300007B91BF /* CCScheduler.h */; }; - 500DC99819106300007B91BF /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91E19106300007B91BF /* ccTypes.cpp */; }; - 500DC99919106300007B91BF /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91E19106300007B91BF /* ccTypes.cpp */; }; - 500DC99A19106300007B91BF /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91F19106300007B91BF /* ccTypes.h */; }; - 500DC99B19106300007B91BF /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91F19106300007B91BF /* ccTypes.h */; }; - 500DC99C19106300007B91BF /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92019106300007B91BF /* CCValue.cpp */; }; - 500DC99D19106300007B91BF /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92019106300007B91BF /* CCValue.cpp */; }; - 500DC99E19106300007B91BF /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92119106300007B91BF /* CCValue.h */; }; - 500DC99F19106300007B91BF /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92119106300007B91BF /* CCValue.h */; }; - 500DC9A019106300007B91BF /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92219106300007B91BF /* CCVector.h */; }; - 500DC9A119106300007B91BF /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92219106300007B91BF /* CCVector.h */; }; - 500DC9A219106300007B91BF /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92419106300007B91BF /* etc1.cpp */; }; - 500DC9A319106300007B91BF /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92419106300007B91BF /* etc1.cpp */; }; - 500DC9A419106300007B91BF /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92519106300007B91BF /* etc1.h */; }; - 500DC9A519106300007B91BF /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92519106300007B91BF /* etc1.h */; }; - 500DC9A619106300007B91BF /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92619106300007B91BF /* s3tc.cpp */; }; - 500DC9A719106300007B91BF /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92619106300007B91BF /* s3tc.cpp */; }; - 500DC9A819106300007B91BF /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92719106300007B91BF /* s3tc.h */; }; - 500DC9A919106300007B91BF /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92719106300007B91BF /* s3tc.h */; }; - 500DC9AA19106300007B91BF /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92819106300007B91BF /* ZipUtils.cpp */; }; - 500DC9AB19106300007B91BF /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92819106300007B91BF /* ZipUtils.cpp */; }; - 500DC9AC19106300007B91BF /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92919106300007B91BF /* ZipUtils.h */; }; - 500DC9AD19106300007B91BF /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92919106300007B91BF /* ZipUtils.h */; }; - 500DC9B01910633C007B91BF /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9AE1910633C007B91BF /* CCTouch.cpp */; }; - 500DC9B11910633C007B91BF /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9AE1910633C007B91BF /* CCTouch.cpp */; }; - 500DC9B21910633C007B91BF /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9AF1910633C007B91BF /* CCTouch.h */; }; - 500DC9B31910633C007B91BF /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9AF1910633C007B91BF /* CCTouch.h */; }; - 500DC9B619106E6D007B91BF /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9B419106E6D007B91BF /* TransformUtils.cpp */; }; - 500DC9B719106E6D007B91BF /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9B419106E6D007B91BF /* TransformUtils.cpp */; }; - 500DC9B819106E6D007B91BF /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9B519106E6D007B91BF /* TransformUtils.h */; }; - 500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9B519106E6D007B91BF /* TransformUtils.h */; }; - 500DC9BC19106E89007B91BF /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9BA19106E89007B91BF /* CCProfiling.cpp */; }; - 500DC9BD19106E89007B91BF /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9BA19106E89007B91BF /* CCProfiling.cpp */; }; - 500DC9BE19106E89007B91BF /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9BB19106E89007B91BF /* CCProfiling.h */; }; - 500DC9BF19106E89007B91BF /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9BB19106E89007B91BF /* CCProfiling.h */; }; 5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; }; 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 */; }; @@ -1608,22 +1289,369 @@ 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 */; }; + 503DD8E01926736A00CD74DD /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8CE1926736A00CD74DD /* CCApplication.h */; }; + 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8CF1926736A00CD74DD /* CCApplication.mm */; }; + 503DD8E21926736A00CD74DD /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D01926736A00CD74DD /* CCCommon.mm */; }; + 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D11926736A00CD74DD /* CCDevice.mm */; }; + 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */; }; + 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */; }; + 503DD8E61926736A00CD74DD /* CCEAGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D41926736A00CD74DD /* CCEAGLView.h */; }; + 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D51926736A00CD74DD /* CCEAGLView.mm */; }; + 503DD8E81926736A00CD74DD /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D61926736A00CD74DD /* CCES2Renderer.h */; }; + 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D71926736A00CD74DD /* CCES2Renderer.m */; }; + 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D81926736A00CD74DD /* CCESRenderer.h */; }; + 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D91926736A00CD74DD /* CCGL.h */; }; + 503DD8EC1926736A00CD74DD /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DA1926736A00CD74DD /* CCGLView.h */; }; + 503DD8ED1926736A00CD74DD /* CCGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DB1926736A00CD74DD /* CCGLView.mm */; }; + 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DC1926736A00CD74DD /* CCImage.mm */; }; + 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */; }; + 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DE1926736A00CD74DD /* CCStdC.h */; }; + 503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */; }; + 503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */; }; + 503DD8F61926B0DB00CD74DD /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */; }; + 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */; }; + 503DD8F81926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */; }; + 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */; }; + 503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */; }; + 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; }; + 50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; }; + 50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */; }; + 50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */; }; + 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */; }; + 50ABBD3D1925AB0000A911A9 /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */; }; + 50ABBD3E1925AB0000A911A9 /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */; }; + 50ABBD3F1925AB0000A911A9 /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */; }; + 50ABBD401925AB0000A911A9 /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1F1925AB0000A911A9 /* CCMath.h */; }; + 50ABBD411925AB0000A911A9 /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1F1925AB0000A911A9 /* CCMath.h */; }; + 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD201925AB0000A911A9 /* CCMathBase.h */; }; + 50ABBD431925AB0000A911A9 /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD201925AB0000A911A9 /* CCMathBase.h */; }; + 50ABBD441925AB0000A911A9 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD211925AB0000A911A9 /* CCVertex.cpp */; }; + 50ABBD451925AB0000A911A9 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD211925AB0000A911A9 /* CCVertex.cpp */; }; + 50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD221925AB0000A911A9 /* CCVertex.h */; }; + 50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD221925AB0000A911A9 /* CCVertex.h */; }; + 50ABBD481925AB0000A911A9 /* Mat4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD231925AB0000A911A9 /* Mat4.cpp */; }; + 50ABBD491925AB0000A911A9 /* Mat4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD231925AB0000A911A9 /* Mat4.cpp */; }; + 50ABBD4A1925AB0000A911A9 /* Mat4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD241925AB0000A911A9 /* Mat4.h */; }; + 50ABBD4B1925AB0000A911A9 /* Mat4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD241925AB0000A911A9 /* Mat4.h */; }; + 50ABBD4C1925AB0000A911A9 /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD261925AB0000A911A9 /* MathUtil.cpp */; }; + 50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD261925AB0000A911A9 /* MathUtil.cpp */; }; + 50ABBD4E1925AB0000A911A9 /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD271925AB0000A911A9 /* MathUtil.h */; }; + 50ABBD4F1925AB0000A911A9 /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD271925AB0000A911A9 /* MathUtil.h */; }; + 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */; }; + 50ABBD511925AB0000A911A9 /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */; }; + 50ABBD521925AB0000A911A9 /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2B1925AB0000A911A9 /* Quaternion.h */; }; + 50ABBD531925AB0000A911A9 /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2B1925AB0000A911A9 /* Quaternion.h */; }; + 50ABBD541925AB0000A911A9 /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */; }; + 50ABBD551925AB0000A911A9 /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */; }; + 50ABBD561925AB0000A911A9 /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */; }; + 50ABBD571925AB0000A911A9 /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */; }; + 50ABBD581925AB0000A911A9 /* Vec2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */; }; + 50ABBD591925AB0000A911A9 /* Vec2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */; }; + 50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD301925AB0000A911A9 /* Vec2.h */; }; + 50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD301925AB0000A911A9 /* Vec2.h */; }; + 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD321925AB0000A911A9 /* Vec3.cpp */; }; + 50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD321925AB0000A911A9 /* Vec3.cpp */; }; + 50ABBD5E1925AB0000A911A9 /* Vec3.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD331925AB0000A911A9 /* Vec3.h */; }; + 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD331925AB0000A911A9 /* Vec3.h */; }; + 50ABBD601925AB0000A911A9 /* Vec4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD351925AB0000A911A9 /* Vec4.cpp */; }; + 50ABBD611925AB0000A911A9 /* Vec4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD351925AB0000A911A9 /* Vec4.cpp */; }; + 50ABBD621925AB0000A911A9 /* Vec4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD361925AB0000A911A9 /* Vec4.h */; }; + 50ABBD631925AB0000A911A9 /* Vec4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD361925AB0000A911A9 /* Vec4.h */; }; + 50ABBD831925AB4100A911A9 /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */; }; + 50ABBD841925AB4100A911A9 /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */; }; + 50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */; }; + 50ABBD861925AB4100A911A9 /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */; }; + 50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */; }; + 50ABBD881925AB4100A911A9 /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */; }; + 50ABBD891925AB4100A911A9 /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */; }; + 50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */; }; + 50ABBD8B1925AB4100A911A9 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */; }; + 50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */; }; + 50ABBD8D1925AB4100A911A9 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD691925AB4100A911A9 /* CCGLProgram.h */; }; + 50ABBD8E1925AB4100A911A9 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD691925AB4100A911A9 /* CCGLProgram.h */; }; + 50ABBD8F1925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */; }; + 50ABBD901925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */; }; + 50ABBD911925AB4100A911A9 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */; }; + 50ABBD921925AB4100A911A9 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */; }; + 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */; }; + 50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */; }; + 50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */; }; + 50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */; }; + 50ABBD971925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */; }; + 50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */; }; + 50ABBD991925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */; }; + 50ABBD9A1925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */; }; + 50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */; }; + 50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */; }; + 50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */; }; + 50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */; }; + 50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */; }; + 50ABBDA01925AB4100A911A9 /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */; }; + 50ABBDA11925AB4100A911A9 /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */; }; + 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */; }; + 50ABBDA31925AB4100A911A9 /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */; }; + 50ABBDA41925AB4100A911A9 /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */; }; + 50ABBDA51925AB4100A911A9 /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */; }; + 50ABBDA61925AB4100A911A9 /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */; }; + 50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */; }; + 50ABBDA81925AB4100A911A9 /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */; }; + 50ABBDA91925AB4100A911A9 /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */; }; + 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */; }; + 50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */; }; + 50ABBDAC1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */; }; + 50ABBDAD1925AB4100A911A9 /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */; }; + 50ABBDAE1925AB4100A911A9 /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */; }; + 50ABBDAF1925AB4100A911A9 /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */; }; + 50ABBDB01925AB4100A911A9 /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */; }; + 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */; }; + 50ABBDB21925AB4100A911A9 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */; }; + 50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7C1925AB4100A911A9 /* ccShaders.h */; }; + 50ABBDB41925AB4100A911A9 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7C1925AB4100A911A9 /* ccShaders.h */; }; + 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */; }; + 50ABBDB61925AB4100A911A9 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */; }; + 50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */; }; + 50ABBDB81925AB4100A911A9 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */; }; + 50ABBDB91925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */; }; + 50ABBDBA1925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */; }; + 50ABBDBB1925AB4100A911A9 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */; }; + 50ABBDBC1925AB4100A911A9 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */; }; + 50ABBDBD1925AB4100A911A9 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */; }; + 50ABBDBE1925AB4100A911A9 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */; }; + 50ABBDBF1925AB4100A911A9 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD821925AB4100A911A9 /* CCTextureCache.h */; }; + 50ABBDC01925AB4100A911A9 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD821925AB4100A911A9 /* CCTextureCache.h */; }; + 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC11925AB6E00A911A9 /* atitc.cpp */; }; + 50ABBE201925AB6F00A911A9 /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC11925AB6E00A911A9 /* atitc.cpp */; }; + 50ABBE211925AB6F00A911A9 /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC21925AB6E00A911A9 /* atitc.h */; }; + 50ABBE221925AB6F00A911A9 /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC21925AB6E00A911A9 /* atitc.h */; }; + 50ABBE231925AB6F00A911A9 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC31925AB6E00A911A9 /* base64.cpp */; }; + 50ABBE241925AB6F00A911A9 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC31925AB6E00A911A9 /* base64.cpp */; }; + 50ABBE251925AB6F00A911A9 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC41925AB6E00A911A9 /* base64.h */; }; + 50ABBE261925AB6F00A911A9 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC41925AB6E00A911A9 /* base64.h */; }; + 50ABBE271925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */; }; + 50ABBE281925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */; }; + 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */; }; + 50ABBE2A1925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */; }; + 50ABBE2B1925AB6F00A911A9 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */; }; + 50ABBE2C1925AB6F00A911A9 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */; }; + 50ABBE2D1925AB6F00A911A9 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC81925AB6E00A911A9 /* ccCArray.h */; }; + 50ABBE2E1925AB6F00A911A9 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC81925AB6E00A911A9 /* ccCArray.h */; }; + 50ABBE2F1925AB6F00A911A9 /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC91925AB6E00A911A9 /* ccConfig.h */; }; + 50ABBE301925AB6F00A911A9 /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC91925AB6E00A911A9 /* ccConfig.h */; }; + 50ABBE311925AB6F00A911A9 /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */; }; + 50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */; }; + 50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */; }; + 50ABBE341925AB6F00A911A9 /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */; }; + 50ABBE351925AB6F00A911A9 /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */; }; + 50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */; }; + 50ABBE371925AB6F00A911A9 /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */; }; + 50ABBE381925AB6F00A911A9 /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */; }; + 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */; }; + 50ABBE3A1925AB6F00A911A9 /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */; }; + 50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCF1925AB6E00A911A9 /* CCData.h */; }; + 50ABBE3C1925AB6F00A911A9 /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCF1925AB6E00A911A9 /* CCData.h */; }; + 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */; }; + 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */; }; + 50ABBE3F1925AB6F00A911A9 /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */; }; + 50ABBE401925AB6F00A911A9 /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */; }; + 50ABBE411925AB6F00A911A9 /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */; }; + 50ABBE421925AB6F00A911A9 /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */; }; + 50ABBE431925AB6F00A911A9 /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD31925AB6E00A911A9 /* CCDirector.h */; }; + 50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD31925AB6E00A911A9 /* CCDirector.h */; }; + 50ABBE451925AB6F00A911A9 /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */; }; + 50ABBE461925AB6F00A911A9 /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */; }; + 50ABBE471925AB6F00A911A9 /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD51925AB6E00A911A9 /* CCEvent.h */; }; + 50ABBE481925AB6F00A911A9 /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD51925AB6E00A911A9 /* CCEvent.h */; }; + 50ABBE491925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */; }; + 50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */; }; + 50ABBE4B1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */; }; + 50ABBE4C1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */; }; + 50ABBE4D1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */; }; + 50ABBE4E1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */; }; + 50ABBE4F1925AB6F00A911A9 /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */; }; + 50ABBE501925AB6F00A911A9 /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */; }; + 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */; }; + 50ABBE521925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */; }; + 50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */; }; + 50ABBE541925AB6F00A911A9 /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */; }; + 50ABBE551925AB6F00A911A9 /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */; }; + 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */; }; + 50ABBE571925AB6F00A911A9 /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */; }; + 50ABBE581925AB6F00A911A9 /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */; }; + 50ABBE591925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */; }; + 50ABBE5A1925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */; }; + 50ABBE5B1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */; }; + 50ABBE5C1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */; }; + 50ABBE5D1925AB6F00A911A9 /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */; }; + 50ABBE5E1925AB6F00A911A9 /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */; }; + 50ABBE5F1925AB6F00A911A9 /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */; }; + 50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */; }; + 50ABBE611925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */; }; + 50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */; }; + 50ABBE631925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */; }; + 50ABBE641925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */; }; + 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */; }; + 50ABBE661925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */; }; + 50ABBE671925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */; }; + 50ABBE681925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */; }; + 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */; }; + 50ABBE6A1925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */; }; + 50ABBE6B1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */; }; + 50ABBE6C1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */; }; + 50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */; }; + 50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */; }; + 50ABBE6F1925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */; }; + 50ABBE701925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */; }; + 50ABBE711925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */; }; + 50ABBE721925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */; }; + 50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */; }; + 50ABBE741925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */; }; + 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */; }; + 50ABBE761925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */; }; + 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */; }; + 50ABBE781925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */; }; + 50ABBE791925AB6F00A911A9 /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */; }; + 50ABBE7A1925AB6F00A911A9 /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */; }; + 50ABBE7B1925AB6F00A911A9 /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */; }; + 50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */; }; + 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */; }; + 50ABBE7E1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */; }; + 50ABBE7F1925AB6F00A911A9 /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */; }; + 50ABBE801925AB6F00A911A9 /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */; }; + 50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF21925AB6E00A911A9 /* CCEventType.h */; }; + 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF21925AB6E00A911A9 /* CCEventType.h */; }; + 50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */; }; + 50ABBE841925AB6F00A911A9 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */; }; + 50ABBE851925AB6F00A911A9 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */; }; + 50ABBE861925AB6F00A911A9 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */; }; + 50ABBE871925AB6F00A911A9 /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF51925AB6E00A911A9 /* ccMacros.h */; }; + 50ABBE881925AB6F00A911A9 /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF51925AB6E00A911A9 /* ccMacros.h */; }; + 50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF61925AB6E00A911A9 /* CCMap.h */; }; + 50ABBE8A1925AB6F00A911A9 /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF61925AB6E00A911A9 /* CCMap.h */; }; + 50ABBE8B1925AB6F00A911A9 /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */; }; + 50ABBE8C1925AB6F00A911A9 /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */; }; + 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; }; + 50ABBE8E1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; }; + 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */; }; + 50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */; }; + 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */; }; + 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */; }; + 50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */; }; + 50ABBE941925AB6F00A911A9 /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */; }; + 50ABBE951925AB6F00A911A9 /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */; }; + 50ABBE961925AB6F00A911A9 /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */; }; + 50ABBE971925AB6F00A911A9 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */; }; + 50ABBE981925AB6F00A911A9 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */; }; + 50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */; }; + 50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */; }; + 50ABBE9B1925AB6F00A911A9 /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFF1925AB6E00A911A9 /* CCRef.h */; }; + 50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFF1925AB6E00A911A9 /* CCRef.h */; }; + 50ABBE9D1925AB6F00A911A9 /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */; }; + 50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */; }; + 50ABBE9F1925AB6F00A911A9 /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */; }; + 50ABBEA01925AB6F00A911A9 /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */; }; + 50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE021925AB6E00A911A9 /* CCScheduler.h */; }; + 50ABBEA21925AB6F00A911A9 /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE021925AB6E00A911A9 /* CCScheduler.h */; }; + 50ABBEA31925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */; }; + 50ABBEA41925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */; }; + 50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */; }; + 50ABBEA61925AB6F00A911A9 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */; }; + 50ABBEA71925AB6F00A911A9 /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */; }; + 50ABBEA81925AB6F00A911A9 /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */; }; + 50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE061925AB6E00A911A9 /* CCTouch.h */; }; + 50ABBEAA1925AB6F00A911A9 /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE061925AB6E00A911A9 /* CCTouch.h */; }; + 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */; }; + 50ABBEAC1925AB6F00A911A9 /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */; }; + 50ABBEAD1925AB6F00A911A9 /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE081925AB6E00A911A9 /* ccTypes.h */; }; + 50ABBEAE1925AB6F00A911A9 /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE081925AB6E00A911A9 /* ccTypes.h */; }; + 50ABBEAF1925AB6F00A911A9 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */; }; + 50ABBEB01925AB6F00A911A9 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */; }; + 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */; }; + 50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */; }; + 50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */; }; + 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */; }; + 50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */; }; + 50ABBEB61925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */; }; + 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */; }; + 50ABBEB81925AB6F00A911A9 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */; }; + 50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */; }; + 50ABBEBA1925AB6F00A911A9 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */; }; + 50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */; }; + 50ABBEBC1925AB6F00A911A9 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */; }; + 50ABBEBD1925AB6F00A911A9 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE101925AB6F00A911A9 /* ccUtils.h */; }; + 50ABBEBE1925AB6F00A911A9 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE101925AB6F00A911A9 /* ccUtils.h */; }; + 50ABBEBF1925AB6F00A911A9 /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE111925AB6F00A911A9 /* CCValue.cpp */; }; + 50ABBEC01925AB6F00A911A9 /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE111925AB6F00A911A9 /* CCValue.cpp */; }; + 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE121925AB6F00A911A9 /* CCValue.h */; }; + 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE121925AB6F00A911A9 /* CCValue.h */; }; + 50ABBEC31925AB6F00A911A9 /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE131925AB6F00A911A9 /* CCVector.h */; }; + 50ABBEC41925AB6F00A911A9 /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE131925AB6F00A911A9 /* CCVector.h */; }; + 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE141925AB6F00A911A9 /* etc1.cpp */; }; + 50ABBEC61925AB6F00A911A9 /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE141925AB6F00A911A9 /* etc1.cpp */; }; + 50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE151925AB6F00A911A9 /* etc1.h */; }; + 50ABBEC81925AB6F00A911A9 /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE151925AB6F00A911A9 /* etc1.h */; }; + 50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE161925AB6F00A911A9 /* firePngData.h */; }; + 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE161925AB6F00A911A9 /* firePngData.h */; }; + 50ABBECB1925AB6F00A911A9 /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE171925AB6F00A911A9 /* s3tc.cpp */; }; + 50ABBECC1925AB6F00A911A9 /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE171925AB6F00A911A9 /* s3tc.cpp */; }; + 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE181925AB6F00A911A9 /* s3tc.h */; }; + 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE181925AB6F00A911A9 /* s3tc.h */; }; + 50ABBECF1925AB6F00A911A9 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */; }; + 50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */; }; + 50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */; }; + 50ABBED21925AB6F00A911A9 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */; }; + 50ABBED31925AB6F00A911A9 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1B1925AB6F00A911A9 /* uthash.h */; }; + 50ABBED41925AB6F00A911A9 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1B1925AB6F00A911A9 /* uthash.h */; }; + 50ABBED51925AB6F00A911A9 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1C1925AB6F00A911A9 /* utlist.h */; }; + 50ABBED61925AB6F00A911A9 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1C1925AB6F00A911A9 /* utlist.h */; }; + 50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */; }; + 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */; }; + 50ABBED91925AB6F00A911A9 /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */; }; + 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */; }; + 50ABBFFD1926664800A911A9 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */; }; + 50ABBFFE1926664800A911A9 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */; }; + 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */; }; + 50ABC0001926664800A911A9 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */; }; + 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock.cpp */; }; + 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock.cpp */; }; + 50ABC0031926664800A911A9 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock.h */; }; + 50ABC0041926664800A911A9 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock.h */; }; + 50ABC0051926664800A911A9 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread.mm */; }; + 50ABC0061926664800A911A9 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread.mm */; }; + 50ABC0071926664800A911A9 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */; }; + 50ABC0081926664800A911A9 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */; }; + 50ABC0091926664800A911A9 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF211926664700A911A9 /* CCCommon.h */; }; + 50ABC00A1926664800A911A9 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF211926664700A911A9 /* CCCommon.h */; }; + 50ABC00B1926664800A911A9 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF221926664700A911A9 /* CCDevice.h */; }; + 50ABC00C1926664800A911A9 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF221926664700A911A9 /* CCDevice.h */; }; + 50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF231926664700A911A9 /* CCFileUtils.cpp */; }; + 50ABC00E1926664800A911A9 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF231926664700A911A9 /* CCFileUtils.cpp */; }; + 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF241926664700A911A9 /* CCFileUtils.h */; }; + 50ABC0101926664800A911A9 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF241926664700A911A9 /* CCFileUtils.h */; }; + 50ABC0111926664800A911A9 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */; }; + 50ABC0121926664800A911A9 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */; }; + 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */; }; + 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */; }; + 50ABC0151926664800A911A9 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF271926664700A911A9 /* CCImage.cpp */; }; + 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF271926664700A911A9 /* CCImage.cpp */; }; + 50ABC0171926664800A911A9 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF281926664700A911A9 /* CCImage.h */; }; + 50ABC0181926664800A911A9 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF281926664700A911A9 /* CCImage.h */; }; + 50ABC0191926664800A911A9 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF291926664700A911A9 /* CCSAXParser.cpp */; }; + 50ABC01A1926664800A911A9 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF291926664700A911A9 /* CCSAXParser.cpp */; }; + 50ABC01B1926664800A911A9 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2A1926664700A911A9 /* CCSAXParser.h */; }; + 50ABC01C1926664800A911A9 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2A1926664700A911A9 /* CCSAXParser.h */; }; + 50ABC01D1926664800A911A9 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2B1926664700A911A9 /* CCThread.cpp */; }; + 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2B1926664700A911A9 /* CCThread.cpp */; }; + 50ABC01F1926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; + 50ABC0201926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; + 50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2E1926664700A911A9 /* CCGLView.cpp */; }; + 50ABC0231926664800A911A9 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2F1926664700A911A9 /* CCGLView.h */; }; + 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF4F1926664700A911A9 /* CCApplication.h */; }; + 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF501926664700A911A9 /* CCApplication.mm */; }; + 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF511926664700A911A9 /* CCCommon.mm */; }; + 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF521926664700A911A9 /* CCDevice.mm */; }; + 50ABC0651926664800A911A9 /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF531926664700A911A9 /* CCGL.h */; }; + 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF541926664700A911A9 /* CCPlatformDefine.h */; }; + 50ABC0691926664800A911A9 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF551926664700A911A9 /* CCStdC.h */; }; 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 */; }; @@ -1698,35 +1726,27 @@ 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 */; }; - 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 */; }; - B2AF2F9518EBAEAE00C5807C /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */; }; - B2AF2F9618EBAEAE00C5807C /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */; }; - B2AF2F9718EBAEAE00C5807C /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8318EBAEAE00C5807C /* MathUtil.h */; }; - B2AF2F9818EBAEAE00C5807C /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8318EBAEAE00C5807C /* MathUtil.h */; }; - B2AF2F9918EBAEAE00C5807C /* Matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */; }; - B2AF2F9A18EBAEAE00C5807C /* Matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */; }; - B2AF2F9B18EBAEAE00C5807C /* Matrix.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8718EBAEAE00C5807C /* Matrix.h */; }; - B2AF2F9C18EBAEAE00C5807C /* Matrix.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8718EBAEAE00C5807C /* Matrix.h */; }; - B2AF2F9D18EBAEAE00C5807C /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */; }; - B2AF2F9E18EBAEAE00C5807C /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */; }; - B2AF2F9F18EBAEAE00C5807C /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */; }; - B2AF2FA018EBAEAE00C5807C /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */; }; - B2AF2FA118EBAEAE00C5807C /* Vector2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */; }; - B2AF2FA218EBAEAE00C5807C /* Vector2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */; }; - B2AF2FA318EBAEAE00C5807C /* Vector2.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8D18EBAEAE00C5807C /* Vector2.h */; }; - B2AF2FA418EBAEAE00C5807C /* Vector2.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8D18EBAEAE00C5807C /* Vector2.h */; }; - B2AF2FA518EBAEAE00C5807C /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */; }; - B2AF2FA618EBAEAE00C5807C /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */; }; - B2AF2FA718EBAEAE00C5807C /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9018EBAEAE00C5807C /* Vector3.h */; }; - B2AF2FA818EBAEAE00C5807C /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9018EBAEAE00C5807C /* Vector3.h */; }; - B2AF2FA918EBAEAE00C5807C /* Vector4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */; }; - B2AF2FAA18EBAEAE00C5807C /* Vector4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */; }; - B2AF2FAB18EBAEAE00C5807C /* Vector4.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9318EBAEAE00C5807C /* Vector4.h */; }; - B2AF2FAC18EBAEAE00C5807C /* Vector4.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9318EBAEAE00C5807C /* Vector4.h */; }; - B2AF2FB118EBBDA100C5807C /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2FB018EBBDA100C5807C /* CCMath.h */; }; - B2AF2FB218EBBDA100C5807C /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2FB018EBBDA100C5807C /* CCMath.h */; }; + B29594B41926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */; }; + B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */; }; + B29594B61926D5EC003EEF37 /* CCMeshCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594B31926D5EC003EEF37 /* CCMeshCommand.h */; }; + B29594B71926D5EC003EEF37 /* CCMeshCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594B31926D5EC003EEF37 /* CCMeshCommand.h */; }; + B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; }; + B29594C31926D61F003EEF37 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; }; + B29594C41926D61F003EEF37 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; }; + B29594C51926D61F003EEF37 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; }; + B29594C61926D61F003EEF37 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; }; + B29594C71926D61F003EEF37 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; }; + B29594C81926D61F003EEF37 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; }; + B29594C91926D61F003EEF37 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; }; + B29594CA1926D61F003EEF37 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; }; + B29594CB1926D61F003EEF37 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; }; + B29594CC1926D61F003EEF37 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; }; + B29594CD1926D61F003EEF37 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; }; + B29594CE1926D61F003EEF37 /* CCSprite3DDataCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DDataCache.cpp */; }; + B29594CF1926D61F003EEF37 /* CCSprite3DDataCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DDataCache.cpp */; }; + B29594D01926D61F003EEF37 /* CCSprite3DDataCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DDataCache.h */; }; + B29594D11926D61F003EEF37 /* CCSprite3DDataCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DDataCache.h */; }; B37510711823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B37510451823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp */; }; B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */ = {isa = PBXBuildFile; fileRef = B37510461823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h */; }; B37510731823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B37510471823AC7B00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp */; }; @@ -1877,9 +1897,6 @@ 1A01C6A318F58F7500EFE3A6 /* CCNotificationCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNotificationCenter.h; sourceTree = ""; }; 1A087AE61860400400196EF5 /* edtaa3func.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = edtaa3func.cpp; sourceTree = ""; }; 1A087AE71860400400196EF5 /* edtaa3func.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = edtaa3func.h; sourceTree = ""; }; - 1A0DB7301823827C0025743D /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - 1A0DB7311823827C0025743D /* CCEAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEAGLView.h; sourceTree = ""; }; - 1A0DB7351823828F0025743D /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; 1A1645AE191B726C008C7C7F /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ConvertUTF.c; sourceTree = ""; }; 1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvertUTFWrapper.cpp; sourceTree = ""; }; 1A570047180BC5A10088DEC7 /* CCAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAction.cpp; sourceTree = ""; }; @@ -1970,8 +1987,6 @@ 1A57021E180BCC1A0088DEC7 /* CCParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystem.h; sourceTree = ""; }; 1A57021F180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCParticleSystemQuad.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystemQuad.h; sourceTree = ""; }; - 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCScriptSupport.cpp; sourceTree = ""; }; - 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCScriptSupport.h; sourceTree = ""; }; 1A570276180BCC900088DEC7 /* CCSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCSprite.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A570277180BCC900088DEC7 /* CCSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite.h; sourceTree = ""; }; 1A570278180BCC900088DEC7 /* CCSpriteBatchNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSpriteBatchNode.cpp; sourceTree = ""; }; @@ -1984,22 +1999,8 @@ 1A57028F180BCCAB0088DEC7 /* CCAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAnimation.h; sourceTree = ""; }; 1A570290180BCCAB0088DEC7 /* CCAnimationCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAnimationCache.cpp; sourceTree = ""; }; 1A570291180BCCAB0088DEC7 /* CCAnimationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAnimationCache.h; sourceTree = ""; }; - 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccUTF8.cpp; sourceTree = ""; }; - 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccUTF8.h; sourceTree = ""; }; - 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertex.cpp; sourceTree = ""; }; - 1A5702B4180BCDF40088DEC7 /* CCVertex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertex.h; sourceTree = ""; }; - 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccUtils.h; sourceTree = ""; }; - 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCIMEDelegate.h; sourceTree = ""; }; - 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCIMEDispatcher.cpp; sourceTree = ""; }; - 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCIMEDispatcher.h; sourceTree = ""; }; 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCTextFieldTTF.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextFieldTTF.h; sourceTree = ""; }; - 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTexture2D.cpp; sourceTree = ""; }; - 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexture2D.h; sourceTree = ""; }; - 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureAtlas.cpp; sourceTree = ""; }; - 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureAtlas.h; sourceTree = ""; }; - 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureCache.cpp; sourceTree = ""; }; - 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureCache.h; sourceTree = ""; }; 1A5702E0180BCE750088DEC7 /* CCTileMapAtlas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTileMapAtlas.cpp; sourceTree = ""; }; 1A5702E1180BCE750088DEC7 /* CCTileMapAtlas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTileMapAtlas.h; sourceTree = ""; }; 1A5702E2180BCE750088DEC7 /* CCTMXLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCTMXLayer.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; @@ -2012,21 +2013,10 @@ 1A5702E9180BCE750088DEC7 /* CCTMXXMLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCTMXXMLParser.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1A5702FE180BCE890088DEC7 /* CCParallaxNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCParallaxNode.cpp; sourceTree = ""; }; 1A5702FF180BCE890088DEC7 /* CCParallaxNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParallaxNode.h; sourceTree = ""; }; - 1A570304180BCED90088DEC7 /* ccUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccUtils.cpp; sourceTree = ""; }; 1A570308180BCF190088DEC7 /* CCComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCComponent.cpp; sourceTree = ""; }; 1A570309180BCF190088DEC7 /* CCComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCComponent.h; sourceTree = ""; }; 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCComponentContainer.cpp; sourceTree = ""; }; 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCComponentContainer.h; sourceTree = ""; }; - 1A570315180BCF430088DEC7 /* ccCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccCArray.cpp; sourceTree = ""; }; - 1A570316180BCF430088DEC7 /* ccCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccCArray.h; sourceTree = ""; }; - 1A570317180BCF430088DEC7 /* uthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uthash.h; sourceTree = ""; }; - 1A570318180BCF430088DEC7 /* utlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utlist.h; sourceTree = ""; }; - 1A570322180BCF660088DEC7 /* TGAlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TGAlib.cpp; sourceTree = ""; }; - 1A570323180BCF660088DEC7 /* TGAlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGAlib.h; sourceTree = ""; }; - 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCUserDefault.cpp; sourceTree = ""; }; - 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCUserDefault.h; sourceTree = ""; }; - 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCUserDefault.mm; sourceTree = ""; }; - 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCUserDefaultAndroid.cpp; sourceTree = ""; }; 1A570346180BD0850088DEC7 /* libglfw3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglfw3.a; path = ../external/glfw3/prebuilt/mac/libglfw3.a; sourceTree = ""; }; 1A570349180BD09B0088DEC7 /* tinyxml2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml2.cpp; sourceTree = ""; }; 1A57034A180BD09B0088DEC7 /* tinyxml2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml2.h; sourceTree = ""; }; @@ -2108,12 +2098,8 @@ 1A8C5986180E930E00EF57C3 /* CocoStudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoStudio.h; sourceTree = ""; }; 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictionaryHelper.cpp; sourceTree = ""; }; 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictionaryHelper.h; sourceTree = ""; }; - 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ccFPSImages.c; sourceTree = ""; }; - 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = ""; }; 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLBufferedNode.cpp; sourceTree = ""; }; 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLBufferedNode.h; sourceTree = ""; }; - 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtocols.h; sourceTree = ""; }; - 1A9DCA0C180E6955007A3AD4 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firePngData.h; sourceTree = ""; }; 1AAF5351180E3060000584C8 /* AssetsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssetsManager.cpp; sourceTree = ""; }; 1AAF5352180E3060000584C8 /* AssetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetsManager.h; sourceTree = ""; }; 1AAF5362180E3374000584C8 /* HttpClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClient.cpp; sourceTree = ""; }; @@ -2269,14 +2255,10 @@ 2905FA1318CF08D100240AA3 /* UIWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidget.cpp; sourceTree = ""; }; 2905FA1418CF08D100240AA3 /* UIWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidget.h; sourceTree = ""; }; 29080DEB191B82CE0066F8DF /* UIDeprecated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIDeprecated.h; sourceTree = ""; }; - 2928C1FE1923756F00E77353 /* UILayoutExecutant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutExecutant.cpp; sourceTree = ""; }; - 2928C1FF1923756F00E77353 /* UILayoutExecutant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutExecutant.h; sourceTree = ""; }; - 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventFocus.cpp; path = ../base/CCEventFocus.cpp; sourceTree = ""; }; - 296CAD211915EC8000C64FBF /* CCEventFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventFocus.h; path = ../base/CCEventFocus.h; sourceTree = ""; }; - 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerFocus.cpp; path = ../base/CCEventListenerFocus.cpp; sourceTree = ""; }; - 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerFocus.h; path = ../base/CCEventListenerFocus.h; sourceTree = ""; }; 2986667818B1B079000E39CA /* CCTweenFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTweenFunction.cpp; sourceTree = ""; }; 2986667918B1B079000E39CA /* CCTweenFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTweenFunction.h; sourceTree = ""; }; + 29CB8F4A1929D1BB00C841D6 /* UILayoutExecutant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutExecutant.cpp; sourceTree = ""; }; + 29CB8F4B1929D1BB00C841D6 /* UILayoutExecutant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutExecutant.h; sourceTree = ""; }; 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoundingBoxAttachment.cpp; sourceTree = ""; }; 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BoundingBoxAttachment.h; sourceTree = ""; }; 2AC795D51862867D005EC8E1 /* Event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Event.cpp; sourceTree = ""; }; @@ -2296,8 +2278,6 @@ 37936A3C1869B76800E974DD /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = ""; }; 37936A3D1869B76800E974DD /* stringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringbuffer.h; sourceTree = ""; }; 37936A3E1869B76800E974DD /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = ""; }; - 3E26D40418ACB5D100834404 /* CCImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCImage.cpp; sourceTree = ""; }; - 3E26D40718ACB63900834404 /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = ""; }; 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; @@ -2519,44 +2499,6 @@ 46A169981807AFD6005B8026 /* cpSweep1D.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cpSweep1D.c; sourceTree = ""; }; 46A169991807AFD6005B8026 /* cpVect.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cpVect.c; sourceTree = ""; }; 46A1699A1807AFD6005B8026 /* prime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prime.h; sourceTree = ""; }; - 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsApple.h; sourceTree = ""; }; - 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCFileUtilsApple.mm; sourceTree = ""; }; - 46A16A911807B038005B8026 /* CCLock.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCLock.cpp; sourceTree = ""; }; - 46A16A921807B038005B8026 /* CCLock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCLock.h; sourceTree = ""; }; - 46A16A931807B038005B8026 /* CCThread.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCThread.mm; sourceTree = ""; }; - 46A16A941807B038005B8026 /* CCApplicationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplicationProtocol.h; sourceTree = ""; }; - 46A16A951807B038005B8026 /* CCCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCCommon.h; sourceTree = ""; }; - 46A16A961807B038005B8026 /* CCDevice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCDevice.h; sourceTree = ""; }; - 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCGLViewProtocol.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - 46A16A981807B038005B8026 /* CCGLViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCGLViewProtocol.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16A991807B038005B8026 /* CCFileUtils.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtils.cpp; sourceTree = ""; }; - 46A16A9A1807B038005B8026 /* CCFileUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtils.h; sourceTree = ""; }; - 46A16A9B1807B038005B8026 /* CCImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCImage.h; sourceTree = ""; }; - 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCSAXParser.cpp; sourceTree = ""; }; - 46A16AA01807B038005B8026 /* CCSAXParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCSAXParser.h; sourceTree = ""; }; - 46A16AA11807B038005B8026 /* CCThread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCThread.cpp; sourceTree = ""; }; - 46A16AA21807B038005B8026 /* CCThread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCThread.h; sourceTree = ""; }; - 46A16AA41807B038005B8026 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - 46A16AA51807B038005B8026 /* CCApplication.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; - 46A16AA61807B038005B8026 /* CCCommon.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; - 46A16AA71807B038005B8026 /* CCDevice.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; - 46A16AA81807B038005B8026 /* CCDirectorCaller.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCDirectorCaller.h; sourceTree = ""; }; - 46A16AA91807B038005B8026 /* CCDirectorCaller.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDirectorCaller.mm; sourceTree = ""; }; - 46A16AAA1807B038005B8026 /* CCGLView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCGLView.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AAB1807B038005B8026 /* CCGLView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCGLView.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AAC1807B038005B8026 /* CCES2Renderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = ""; }; - 46A16AAD1807B038005B8026 /* CCES2Renderer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = ""; }; - 46A16AAE1807B038005B8026 /* CCESRenderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = ""; }; - 46A16AB01807B038005B8026 /* CCImage.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCImage.mm; sourceTree = ""; }; - 46A16AB11807B038005B8026 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - 46A16AB21807B038005B8026 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - 46A16AB41807B038005B8026 /* CCEAGLView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEAGLView.mm; sourceTree = ""; }; - 46A16AB51807B038005B8026 /* OpenGL_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenGL_Internal.h; sourceTree = ""; }; - 46A16AC81807B038005B8026 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCApplication.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AC91807B038005B8026 /* CCApplication.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCApplication.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16ACA1807B038005B8026 /* CCCommon.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCCommon.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AD41807B038005B8026 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - 46A16AD51807B038005B8026 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; 46A16E1B1807C948005B8026 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../cocos/2d/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; 46A16E1C1807C948005B8026 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = ../cocos/2d/platform/third_party/ios/libraries/libfreetype.a; sourceTree = ""; }; 46A16E1D1807C948005B8026 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../cocos/2d/platform/third_party/ios/libraries/libjpeg.a; sourceTree = ""; }; @@ -2583,103 +2525,8 @@ 46A170781807CE7A005B8026 /* CCPhysicsWorld.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPhysicsWorld.h; sourceTree = ""; }; 46C02E0518E91123004B7456 /* xxhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xxhash.c; sourceTree = ""; }; 46C02E0618E91123004B7456 /* xxhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxhash.h; sourceTree = ""; }; - 500DC89919105D41007B91BF /* CCBatchCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBatchCommand.cpp; sourceTree = ""; }; - 500DC89A19105D41007B91BF /* CCBatchCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBatchCommand.h; sourceTree = ""; }; - 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCCustomCommand.cpp; sourceTree = ""; }; - 500DC89C19105D41007B91BF /* CCCustomCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCustomCommand.h; sourceTree = ""; }; - 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGroupCommand.cpp; sourceTree = ""; }; - 500DC89E19105D41007B91BF /* CCGroupCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGroupCommand.h; sourceTree = ""; }; - 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCQuadCommand.cpp; sourceTree = ""; }; - 500DC8A219105D41007B91BF /* CCQuadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCQuadCommand.h; sourceTree = ""; }; - 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderCommand.cpp; sourceTree = ""; }; - 500DC8A419105D41007B91BF /* CCRenderCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommand.h; sourceTree = ""; }; - 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommandPool.h; sourceTree = ""; }; - 500DC8A619105D41007B91BF /* CCRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderer.cpp; sourceTree = ""; }; - 500DC8A719105D41007B91BF /* CCRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer.h; sourceTree = ""; }; - 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = ""; }; - 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = ""; }; - 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGeometry.cpp; sourceTree = ""; }; - 500DC8CF19105F7D007B91BF /* CCGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGeometry.h; sourceTree = ""; }; - 500DC8D019105F7D007B91BF /* CCMathBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMathBase.h; sourceTree = ""; }; - 500DC8E719106300007B91BF /* atitc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = atitc.cpp; path = ../base/atitc.cpp; sourceTree = ""; }; - 500DC8E819106300007B91BF /* atitc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = atitc.h; path = ../base/atitc.h; sourceTree = ""; }; - 500DC8E919106300007B91BF /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../base/base64.cpp; sourceTree = ""; }; - 500DC8EA19106300007B91BF /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../base/base64.h; sourceTree = ""; }; - 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCAutoreleasePool.cpp; path = ../base/CCAutoreleasePool.cpp; sourceTree = ""; }; - 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCAutoreleasePool.h; path = ../base/CCAutoreleasePool.h; sourceTree = ""; }; - 500DC8ED19106300007B91BF /* ccConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccConfig.h; path = ../base/ccConfig.h; sourceTree = ""; }; - 500DC8EE19106300007B91BF /* CCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConfiguration.cpp; path = ../base/CCConfiguration.cpp; sourceTree = ""; }; - 500DC8EF19106300007B91BF /* CCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConfiguration.h; path = ../base/CCConfiguration.h; sourceTree = ""; }; - 500DC8F019106300007B91BF /* CCConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConsole.cpp; path = ../base/CCConsole.cpp; sourceTree = ""; }; - 500DC8F119106300007B91BF /* CCConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConsole.h; path = ../base/CCConsole.h; sourceTree = ""; }; - 500DC8F219106300007B91BF /* CCData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCData.cpp; path = ../base/CCData.cpp; sourceTree = ""; }; - 500DC8F319106300007B91BF /* CCData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCData.h; path = ../base/CCData.h; sourceTree = ""; }; - 500DC8F419106300007B91BF /* CCDataVisitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDataVisitor.cpp; path = ../base/CCDataVisitor.cpp; sourceTree = ""; }; - 500DC8F519106300007B91BF /* CCDataVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDataVisitor.h; path = ../base/CCDataVisitor.h; sourceTree = ""; }; - 500DC8F619106300007B91BF /* CCDirector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDirector.cpp; path = ../base/CCDirector.cpp; sourceTree = ""; }; - 500DC8F719106300007B91BF /* CCDirector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDirector.h; path = ../base/CCDirector.h; sourceTree = ""; }; - 500DC8F819106300007B91BF /* CCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEvent.cpp; path = ../base/CCEvent.cpp; sourceTree = ""; }; - 500DC8F919106300007B91BF /* CCEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEvent.h; path = ../base/CCEvent.h; sourceTree = ""; }; - 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventAcceleration.cpp; path = ../base/CCEventAcceleration.cpp; sourceTree = ""; }; - 500DC8FB19106300007B91BF /* CCEventAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventAcceleration.h; path = ../base/CCEventAcceleration.h; sourceTree = ""; }; - 500DC8FC19106300007B91BF /* CCEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventCustom.cpp; path = ../base/CCEventCustom.cpp; sourceTree = ""; }; - 500DC8FD19106300007B91BF /* CCEventCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventCustom.h; path = ../base/CCEventCustom.h; sourceTree = ""; }; - 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventDispatcher.cpp; path = ../base/CCEventDispatcher.cpp; sourceTree = ""; }; - 500DC8FF19106300007B91BF /* CCEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventDispatcher.h; path = ../base/CCEventDispatcher.h; sourceTree = ""; }; - 500DC90019106300007B91BF /* CCEventKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventKeyboard.cpp; path = ../base/CCEventKeyboard.cpp; sourceTree = ""; }; - 500DC90119106300007B91BF /* CCEventKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventKeyboard.h; path = ../base/CCEventKeyboard.h; sourceTree = ""; }; - 500DC90219106300007B91BF /* CCEventListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListener.cpp; path = ../base/CCEventListener.cpp; sourceTree = ""; }; - 500DC90319106300007B91BF /* CCEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListener.h; path = ../base/CCEventListener.h; sourceTree = ""; }; - 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerAcceleration.cpp; path = ../base/CCEventListenerAcceleration.cpp; sourceTree = ""; }; - 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerAcceleration.h; path = ../base/CCEventListenerAcceleration.h; sourceTree = ""; }; - 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerCustom.cpp; path = ../base/CCEventListenerCustom.cpp; sourceTree = ""; }; - 500DC90719106300007B91BF /* CCEventListenerCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerCustom.h; path = ../base/CCEventListenerCustom.h; sourceTree = ""; }; - 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerKeyboard.cpp; path = ../base/CCEventListenerKeyboard.cpp; sourceTree = ""; }; - 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerKeyboard.h; path = ../base/CCEventListenerKeyboard.h; sourceTree = ""; }; - 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerMouse.cpp; path = ../base/CCEventListenerMouse.cpp; sourceTree = ""; }; - 500DC90B19106300007B91BF /* CCEventListenerMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerMouse.h; path = ../base/CCEventListenerMouse.h; sourceTree = ""; }; - 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerTouch.cpp; path = ../base/CCEventListenerTouch.cpp; sourceTree = ""; }; - 500DC90D19106300007B91BF /* CCEventListenerTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerTouch.h; path = ../base/CCEventListenerTouch.h; sourceTree = ""; }; - 500DC90E19106300007B91BF /* CCEventMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventMouse.cpp; path = ../base/CCEventMouse.cpp; sourceTree = ""; }; - 500DC90F19106300007B91BF /* CCEventMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventMouse.h; path = ../base/CCEventMouse.h; sourceTree = ""; }; - 500DC91019106300007B91BF /* CCEventTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventTouch.cpp; path = ../base/CCEventTouch.cpp; sourceTree = ""; }; - 500DC91119106300007B91BF /* CCEventTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventTouch.h; path = ../base/CCEventTouch.h; sourceTree = ""; }; - 500DC91219106300007B91BF /* CCEventType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventType.h; path = ../base/CCEventType.h; sourceTree = ""; }; - 500DC91319106300007B91BF /* ccMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccMacros.h; path = ../base/ccMacros.h; sourceTree = ""; }; - 500DC91419106300007B91BF /* CCMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMap.h; path = ../base/CCMap.h; sourceTree = ""; }; - 500DC91519106300007B91BF /* CCNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNS.cpp; path = ../base/CCNS.cpp; sourceTree = ""; }; - 500DC91619106300007B91BF /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNS.h; path = ../base/CCNS.h; sourceTree = ""; }; - 500DC91719106300007B91BF /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformConfig.h; path = ../base/CCPlatformConfig.h; sourceTree = ""; }; - 500DC91819106300007B91BF /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformMacros.h; path = ../base/CCPlatformMacros.h; sourceTree = ""; }; - 500DC91919106300007B91BF /* CCRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCRef.cpp; path = ../base/CCRef.cpp; sourceTree = ""; }; - 500DC91A19106300007B91BF /* CCRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRef.h; path = ../base/CCRef.h; sourceTree = ""; }; - 500DC91B19106300007B91BF /* CCRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRefPtr.h; path = ../base/CCRefPtr.h; sourceTree = ""; }; - 500DC91C19106300007B91BF /* CCScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCScheduler.cpp; path = ../base/CCScheduler.cpp; sourceTree = ""; }; - 500DC91D19106300007B91BF /* CCScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCScheduler.h; path = ../base/CCScheduler.h; sourceTree = ""; }; - 500DC91E19106300007B91BF /* ccTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccTypes.cpp; path = ../base/ccTypes.cpp; sourceTree = ""; }; - 500DC91F19106300007B91BF /* ccTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccTypes.h; path = ../base/ccTypes.h; sourceTree = ""; }; - 500DC92019106300007B91BF /* CCValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCValue.cpp; path = ../base/CCValue.cpp; sourceTree = ""; }; - 500DC92119106300007B91BF /* CCValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCValue.h; path = ../base/CCValue.h; sourceTree = ""; }; - 500DC92219106300007B91BF /* CCVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCVector.h; path = ../base/CCVector.h; sourceTree = ""; }; - 500DC92319106300007B91BF /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../base/CMakeLists.txt; sourceTree = ""; }; - 500DC92419106300007B91BF /* etc1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = etc1.cpp; path = ../base/etc1.cpp; sourceTree = ""; }; - 500DC92519106300007B91BF /* etc1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = etc1.h; path = ../base/etc1.h; sourceTree = ""; }; - 500DC92619106300007B91BF /* s3tc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = s3tc.cpp; path = ../base/s3tc.cpp; sourceTree = ""; }; - 500DC92719106300007B91BF /* s3tc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = s3tc.h; path = ../base/s3tc.h; sourceTree = ""; }; - 500DC92819106300007B91BF /* ZipUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZipUtils.cpp; path = ../base/ZipUtils.cpp; sourceTree = ""; }; - 500DC92919106300007B91BF /* ZipUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZipUtils.h; path = ../base/ZipUtils.h; sourceTree = ""; }; - 500DC9AE1910633C007B91BF /* CCTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCTouch.cpp; path = ../base/CCTouch.cpp; sourceTree = ""; }; - 500DC9AF1910633C007B91BF /* CCTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCTouch.h; path = ../base/CCTouch.h; sourceTree = ""; }; - 500DC9B419106E6D007B91BF /* TransformUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformUtils.cpp; sourceTree = ""; }; - 500DC9B519106E6D007B91BF /* TransformUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformUtils.h; sourceTree = ""; }; - 500DC9BA19106E89007B91BF /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = ""; }; - 500DC9BB19106E89007B91BF /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = ""; }; 50272538190BF1B900AAF4ED /* cocos2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = ../cocos/cocos2d.h; sourceTree = ""; }; 50272539190BF1B900AAF4ED /* cocos2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2d.cpp; path = ../cocos/cocos2d.cpp; sourceTree = ""; }; - 5034C9F7191D591000CE6051 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; - 5034C9F8191D591000CE6051 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; - 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramCache.h; sourceTree = ""; }; - 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramCache.cpp; sourceTree = ""; }; 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColorAlphaTest.frag; sourceTree = ""; }; 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.vert; sourceTree = ""; }; 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.frag; sourceTree = ""; }; @@ -2698,18 +2545,212 @@ 5034CA0E191D591000CE6051 /* ccShader_Label_normal.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_normal.frag; sourceTree = ""; }; 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df.frag; sourceTree = ""; }; 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df_glow.frag; sourceTree = ""; }; - 5034CA11191D591000CE6051 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; - 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; - 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = ""; }; - 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = ""; }; - 5034CA15191D591000CE6051 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = ""; }; - 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = ""; }; - 5034CA17191D591000CE6051 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; - 5034CA18191D591000CE6051 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; 5034CA60191D91CF00CE6051 /* ccShader_PositionTextureColor.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.vert; sourceTree = ""; }; 5034CA61191D91CF00CE6051 /* ccShader_PositionTextureColor.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.frag; sourceTree = ""; }; 5034CA62191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.vert; sourceTree = ""; }; 5034CA63191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.frag; sourceTree = ""; }; + 503DD8CE1926736A00CD74DD /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; + 503DD8CF1926736A00CD74DD /* CCApplication.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; + 503DD8D01926736A00CD74DD /* CCCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; + 503DD8D11926736A00CD74DD /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; + 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorCaller.h; sourceTree = ""; }; + 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDirectorCaller.mm; sourceTree = ""; }; + 503DD8D41926736A00CD74DD /* CCEAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEAGLView.h; sourceTree = ""; }; + 503DD8D51926736A00CD74DD /* CCEAGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEAGLView.mm; sourceTree = ""; }; + 503DD8D61926736A00CD74DD /* CCES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = ""; }; + 503DD8D71926736A00CD74DD /* CCES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = ""; }; + 503DD8D81926736A00CD74DD /* CCESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = ""; }; + 503DD8D91926736A00CD74DD /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; + 503DD8DA1926736A00CD74DD /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; + 503DD8DB1926736A00CD74DD /* CCGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCGLView.mm; sourceTree = ""; }; + 503DD8DC1926736A00CD74DD /* CCImage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCImage.mm; sourceTree = ""; }; + 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; + 503DD8DE1926736A00CD74DD /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; + 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenGL_Internal.h; sourceTree = ""; }; + 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCIMEDelegate.h; path = ../base/CCIMEDelegate.h; sourceTree = ""; }; + 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCIMEDispatcher.cpp; path = ../base/CCIMEDispatcher.cpp; sourceTree = ""; }; + 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCIMEDispatcher.h; path = ../base/CCIMEDispatcher.h; sourceTree = ""; }; + 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = ""; }; + 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = ""; }; + 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGeometry.cpp; sourceTree = ""; }; + 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGeometry.h; sourceTree = ""; }; + 50ABBD1F1925AB0000A911A9 /* CCMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMath.h; sourceTree = ""; }; + 50ABBD201925AB0000A911A9 /* CCMathBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMathBase.h; sourceTree = ""; }; + 50ABBD211925AB0000A911A9 /* CCVertex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertex.cpp; sourceTree = ""; }; + 50ABBD221925AB0000A911A9 /* CCVertex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertex.h; sourceTree = ""; }; + 50ABBD231925AB0000A911A9 /* Mat4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mat4.cpp; sourceTree = ""; }; + 50ABBD241925AB0000A911A9 /* Mat4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mat4.h; sourceTree = ""; }; + 50ABBD251925AB0000A911A9 /* Mat4.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Mat4.inl; sourceTree = ""; }; + 50ABBD261925AB0000A911A9 /* MathUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathUtil.cpp; sourceTree = ""; }; + 50ABBD271925AB0000A911A9 /* MathUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathUtil.h; sourceTree = ""; }; + 50ABBD281925AB0000A911A9 /* MathUtil.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtil.inl; sourceTree = ""; }; + 50ABBD291925AB0000A911A9 /* MathUtilNeon.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtilNeon.inl; sourceTree = ""; }; + 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Quaternion.cpp; sourceTree = ""; }; + 50ABBD2B1925AB0000A911A9 /* Quaternion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Quaternion.h; sourceTree = ""; }; + 50ABBD2C1925AB0000A911A9 /* Quaternion.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Quaternion.inl; sourceTree = ""; }; + 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformUtils.cpp; sourceTree = ""; }; + 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformUtils.h; sourceTree = ""; }; + 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vec2.cpp; sourceTree = ""; }; + 50ABBD301925AB0000A911A9 /* Vec2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vec2.h; sourceTree = ""; }; + 50ABBD311925AB0000A911A9 /* Vec2.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vec2.inl; sourceTree = ""; }; + 50ABBD321925AB0000A911A9 /* Vec3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vec3.cpp; sourceTree = ""; }; + 50ABBD331925AB0000A911A9 /* Vec3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vec3.h; sourceTree = ""; }; + 50ABBD341925AB0000A911A9 /* Vec3.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vec3.inl; sourceTree = ""; }; + 50ABBD351925AB0000A911A9 /* Vec4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vec4.cpp; sourceTree = ""; }; + 50ABBD361925AB0000A911A9 /* Vec4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vec4.h; sourceTree = ""; }; + 50ABBD371925AB0000A911A9 /* Vec4.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vec4.inl; sourceTree = ""; }; + 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBatchCommand.cpp; sourceTree = ""; }; + 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBatchCommand.h; sourceTree = ""; }; + 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCCustomCommand.cpp; sourceTree = ""; }; + 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCustomCommand.h; sourceTree = ""; }; + 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; + 50ABBD691925AB4100A911A9 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; + 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramCache.cpp; sourceTree = ""; }; + 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramCache.h; sourceTree = ""; }; + 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = ""; }; + 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = ""; }; + 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = ""; }; + 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = ""; }; + 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; + 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; + 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGroupCommand.cpp; sourceTree = ""; }; + 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGroupCommand.h; sourceTree = ""; }; + 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCQuadCommand.cpp; sourceTree = ""; }; + 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCQuadCommand.h; sourceTree = ""; }; + 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderCommand.cpp; sourceTree = ""; }; + 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommand.h; sourceTree = ""; }; + 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommandPool.h; sourceTree = ""; }; + 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderer.cpp; sourceTree = ""; }; + 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer.h; sourceTree = ""; }; + 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; + 50ABBD7C1925AB4100A911A9 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; + 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTexture2D.cpp; sourceTree = ""; }; + 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexture2D.h; sourceTree = ""; }; + 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureAtlas.cpp; sourceTree = ""; }; + 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureAtlas.h; sourceTree = ""; }; + 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureCache.cpp; sourceTree = ""; }; + 50ABBD821925AB4100A911A9 /* CCTextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureCache.h; sourceTree = ""; }; + 50ABBDC11925AB6E00A911A9 /* atitc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = atitc.cpp; path = ../base/atitc.cpp; sourceTree = ""; }; + 50ABBDC21925AB6E00A911A9 /* atitc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = atitc.h; path = ../base/atitc.h; sourceTree = ""; }; + 50ABBDC31925AB6E00A911A9 /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../base/base64.cpp; sourceTree = ""; }; + 50ABBDC41925AB6E00A911A9 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../base/base64.h; sourceTree = ""; }; + 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCAutoreleasePool.cpp; path = ../base/CCAutoreleasePool.cpp; sourceTree = ""; }; + 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCAutoreleasePool.h; path = ../base/CCAutoreleasePool.h; sourceTree = ""; }; + 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccCArray.cpp; path = ../base/ccCArray.cpp; sourceTree = ""; }; + 50ABBDC81925AB6E00A911A9 /* ccCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccCArray.h; path = ../base/ccCArray.h; sourceTree = ""; }; + 50ABBDC91925AB6E00A911A9 /* ccConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccConfig.h; path = ../base/ccConfig.h; sourceTree = ""; }; + 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConfiguration.cpp; path = ../base/CCConfiguration.cpp; sourceTree = ""; }; + 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConfiguration.h; path = ../base/CCConfiguration.h; sourceTree = ""; }; + 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConsole.cpp; path = ../base/CCConsole.cpp; sourceTree = ""; }; + 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConsole.h; path = ../base/CCConsole.h; sourceTree = ""; }; + 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCData.cpp; path = ../base/CCData.cpp; sourceTree = ""; }; + 50ABBDCF1925AB6E00A911A9 /* CCData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCData.h; path = ../base/CCData.h; sourceTree = ""; }; + 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDataVisitor.cpp; path = ../base/CCDataVisitor.cpp; sourceTree = ""; }; + 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDataVisitor.h; path = ../base/CCDataVisitor.h; sourceTree = ""; }; + 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDirector.cpp; path = ../base/CCDirector.cpp; sourceTree = ""; }; + 50ABBDD31925AB6E00A911A9 /* CCDirector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDirector.h; path = ../base/CCDirector.h; sourceTree = ""; }; + 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEvent.cpp; path = ../base/CCEvent.cpp; sourceTree = ""; }; + 50ABBDD51925AB6E00A911A9 /* CCEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEvent.h; path = ../base/CCEvent.h; sourceTree = ""; }; + 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventAcceleration.cpp; path = ../base/CCEventAcceleration.cpp; sourceTree = ""; }; + 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventAcceleration.h; path = ../base/CCEventAcceleration.h; sourceTree = ""; }; + 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventCustom.cpp; path = ../base/CCEventCustom.cpp; sourceTree = ""; }; + 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventCustom.h; path = ../base/CCEventCustom.h; sourceTree = ""; }; + 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventDispatcher.cpp; path = ../base/CCEventDispatcher.cpp; sourceTree = ""; }; + 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventDispatcher.h; path = ../base/CCEventDispatcher.h; sourceTree = ""; }; + 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventFocus.cpp; path = ../base/CCEventFocus.cpp; sourceTree = ""; }; + 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventFocus.h; path = ../base/CCEventFocus.h; sourceTree = ""; }; + 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventKeyboard.cpp; path = ../base/CCEventKeyboard.cpp; sourceTree = ""; }; + 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventKeyboard.h; path = ../base/CCEventKeyboard.h; sourceTree = ""; }; + 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListener.cpp; path = ../base/CCEventListener.cpp; sourceTree = ""; }; + 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListener.h; path = ../base/CCEventListener.h; sourceTree = ""; }; + 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerAcceleration.cpp; path = ../base/CCEventListenerAcceleration.cpp; sourceTree = ""; }; + 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerAcceleration.h; path = ../base/CCEventListenerAcceleration.h; sourceTree = ""; }; + 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerCustom.cpp; path = ../base/CCEventListenerCustom.cpp; sourceTree = ""; }; + 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerCustom.h; path = ../base/CCEventListenerCustom.h; sourceTree = ""; }; + 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerFocus.cpp; path = ../base/CCEventListenerFocus.cpp; sourceTree = ""; }; + 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerFocus.h; path = ../base/CCEventListenerFocus.h; sourceTree = ""; }; + 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerKeyboard.cpp; path = ../base/CCEventListenerKeyboard.cpp; sourceTree = ""; }; + 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerKeyboard.h; path = ../base/CCEventListenerKeyboard.h; sourceTree = ""; }; + 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerMouse.cpp; path = ../base/CCEventListenerMouse.cpp; sourceTree = ""; }; + 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerMouse.h; path = ../base/CCEventListenerMouse.h; sourceTree = ""; }; + 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerTouch.cpp; path = ../base/CCEventListenerTouch.cpp; sourceTree = ""; }; + 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerTouch.h; path = ../base/CCEventListenerTouch.h; sourceTree = ""; }; + 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventMouse.cpp; path = ../base/CCEventMouse.cpp; sourceTree = ""; }; + 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventMouse.h; path = ../base/CCEventMouse.h; sourceTree = ""; }; + 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventTouch.cpp; path = ../base/CCEventTouch.cpp; sourceTree = ""; }; + 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventTouch.h; path = ../base/CCEventTouch.h; sourceTree = ""; }; + 50ABBDF21925AB6E00A911A9 /* CCEventType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventType.h; path = ../base/CCEventType.h; sourceTree = ""; }; + 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ccFPSImages.c; path = ../base/ccFPSImages.c; sourceTree = ""; }; + 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccFPSImages.h; path = ../base/ccFPSImages.h; sourceTree = ""; }; + 50ABBDF51925AB6E00A911A9 /* ccMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccMacros.h; path = ../base/ccMacros.h; sourceTree = ""; }; + 50ABBDF61925AB6E00A911A9 /* CCMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMap.h; path = ../base/CCMap.h; sourceTree = ""; }; + 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNS.cpp; path = ../base/CCNS.cpp; sourceTree = ""; }; + 50ABBDF81925AB6E00A911A9 /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNS.h; path = ../base/CCNS.h; sourceTree = ""; }; + 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformConfig.h; path = ../base/CCPlatformConfig.h; sourceTree = ""; }; + 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformMacros.h; path = ../base/CCPlatformMacros.h; sourceTree = ""; }; + 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = ""; }; + 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = ""; }; + 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProtocols.h; path = ../base/CCProtocols.h; sourceTree = ""; }; + 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCRef.cpp; path = ../base/CCRef.cpp; sourceTree = ""; }; + 50ABBDFF1925AB6E00A911A9 /* CCRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRef.h; path = ../base/CCRef.h; sourceTree = ""; }; + 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRefPtr.h; path = ../base/CCRefPtr.h; sourceTree = ""; }; + 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCScheduler.cpp; path = ../base/CCScheduler.cpp; sourceTree = ""; }; + 50ABBE021925AB6E00A911A9 /* CCScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCScheduler.h; path = ../base/CCScheduler.h; sourceTree = ""; }; + 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCScriptSupport.cpp; path = ../base/CCScriptSupport.cpp; sourceTree = ""; }; + 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCScriptSupport.h; path = ../base/CCScriptSupport.h; sourceTree = ""; }; + 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCTouch.cpp; path = ../base/CCTouch.cpp; sourceTree = ""; }; + 50ABBE061925AB6E00A911A9 /* CCTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCTouch.h; path = ../base/CCTouch.h; sourceTree = ""; }; + 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccTypes.cpp; path = ../base/ccTypes.cpp; sourceTree = ""; }; + 50ABBE081925AB6E00A911A9 /* ccTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccTypes.h; path = ../base/ccTypes.h; sourceTree = ""; }; + 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCUserDefault.cpp; path = ../base/CCUserDefault.cpp; sourceTree = ""; }; + 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCUserDefault.h; path = ../base/CCUserDefault.h; sourceTree = ""; }; + 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CCUserDefault.mm; path = ../base/CCUserDefault.mm; sourceTree = ""; }; + 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCUserDefaultAndroid.cpp; path = ../base/CCUserDefaultAndroid.cpp; sourceTree = ""; }; + 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccUTF8.cpp; path = ../base/ccUTF8.cpp; sourceTree = ""; }; + 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccUTF8.h; path = ../base/ccUTF8.h; sourceTree = ""; }; + 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccUtils.cpp; path = ../base/ccUtils.cpp; sourceTree = ""; }; + 50ABBE101925AB6F00A911A9 /* ccUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccUtils.h; path = ../base/ccUtils.h; sourceTree = ""; }; + 50ABBE111925AB6F00A911A9 /* CCValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCValue.cpp; path = ../base/CCValue.cpp; sourceTree = ""; }; + 50ABBE121925AB6F00A911A9 /* CCValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCValue.h; path = ../base/CCValue.h; sourceTree = ""; }; + 50ABBE131925AB6F00A911A9 /* CCVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCVector.h; path = ../base/CCVector.h; sourceTree = ""; }; + 50ABBE141925AB6F00A911A9 /* etc1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = etc1.cpp; path = ../base/etc1.cpp; sourceTree = ""; }; + 50ABBE151925AB6F00A911A9 /* etc1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = etc1.h; path = ../base/etc1.h; sourceTree = ""; }; + 50ABBE161925AB6F00A911A9 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = firePngData.h; path = ../base/firePngData.h; sourceTree = ""; }; + 50ABBE171925AB6F00A911A9 /* s3tc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = s3tc.cpp; path = ../base/s3tc.cpp; sourceTree = ""; }; + 50ABBE181925AB6F00A911A9 /* s3tc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = s3tc.h; path = ../base/s3tc.h; sourceTree = ""; }; + 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TGAlib.cpp; path = ../base/TGAlib.cpp; sourceTree = ""; }; + 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TGAlib.h; path = ../base/TGAlib.h; sourceTree = ""; }; + 50ABBE1B1925AB6F00A911A9 /* uthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uthash.h; path = ../base/uthash.h; sourceTree = ""; }; + 50ABBE1C1925AB6F00A911A9 /* utlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utlist.h; path = ../base/utlist.h; sourceTree = ""; }; + 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZipUtils.cpp; path = ../base/ZipUtils.cpp; sourceTree = ""; }; + 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZipUtils.h; path = ../base/ZipUtils.h; sourceTree = ""; }; + 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsApple.h; sourceTree = ""; }; + 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCFileUtilsApple.mm; sourceTree = ""; }; + 50ABBF1D1926664700A911A9 /* CCLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCLock.cpp; sourceTree = ""; }; + 50ABBF1E1926664700A911A9 /* CCLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLock.h; sourceTree = ""; }; + 50ABBF1F1926664700A911A9 /* CCThread.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCThread.mm; sourceTree = ""; }; + 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplicationProtocol.h; sourceTree = ""; }; + 50ABBF211926664700A911A9 /* CCCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCommon.h; sourceTree = ""; }; + 50ABBF221926664700A911A9 /* CCDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDevice.h; sourceTree = ""; }; + 50ABBF231926664700A911A9 /* CCFileUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtils.cpp; sourceTree = ""; }; + 50ABBF241926664700A911A9 /* CCFileUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFileUtils.h; sourceTree = ""; }; + 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLViewProtocol.cpp; sourceTree = ""; }; + 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewProtocol.h; sourceTree = ""; }; + 50ABBF271926664700A911A9 /* CCImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCImage.cpp; sourceTree = ""; }; + 50ABBF281926664700A911A9 /* CCImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCImage.h; sourceTree = ""; }; + 50ABBF291926664700A911A9 /* CCSAXParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSAXParser.cpp; sourceTree = ""; }; + 50ABBF2A1926664700A911A9 /* CCSAXParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSAXParser.h; sourceTree = ""; }; + 50ABBF2B1926664700A911A9 /* CCThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCThread.cpp; sourceTree = ""; }; + 50ABBF2C1926664700A911A9 /* CCThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCThread.h; sourceTree = ""; }; + 50ABBF2E1926664700A911A9 /* CCGLView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLView.cpp; sourceTree = ""; }; + 50ABBF2F1926664700A911A9 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; + 50ABBF4F1926664700A911A9 /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; + 50ABBF501926664700A911A9 /* CCApplication.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; + 50ABBF511926664700A911A9 /* CCCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; + 50ABBF521926664700A911A9 /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; + 50ABBF531926664700A911A9 /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; + 50ABBF541926664700A911A9 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; + 50ABBF551926664700A911A9 /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = ""; }; 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = ""; }; 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = ""; }; @@ -2748,69 +2789,28 @@ 50FCEB9018C72017004AD434 /* WidgetReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WidgetReader.cpp; sourceTree = ""; }; 50FCEB9118C72017004AD434 /* WidgetReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReader.h; sourceTree = ""; }; 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReaderProtocol.h; sourceTree = ""; }; - A0053F46189B2BEA0035A564 /* Android.mk */ = {isa = PBXFileReference; lastKnownFileType = text; path = Android.mk; sourceTree = ""; }; - A0053F47189B2BEA0035A564 /* CCApplication.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCApplication.cpp; sourceTree = ""; }; - A0053F48189B2BEA0035A564 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - A0053F49189B2BEA0035A564 /* CCCommon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCCommon.cpp; sourceTree = ""; }; - A0053F4A189B2BEA0035A564 /* CCDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCDevice.cpp; sourceTree = ""; }; - A0053F4B189B2BEA0035A564 /* CCFileUtilsAndroid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtilsAndroid.cpp; sourceTree = ""; }; - A0053F4C189B2BEA0035A564 /* CCFileUtilsAndroid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsAndroid.h; sourceTree = ""; }; - A0053F4D189B2BEA0035A564 /* CCGL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - A0053F4E189B2BEA0035A564 /* CCGLView.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLView.cpp; sourceTree = ""; }; - A0053F4F189B2BEA0035A564 /* CCGLView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; - A0053F51189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - A0053F52189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - A0053FA8189B2BEA0035A564 /* CCApplication.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCApplication.cpp; sourceTree = ""; }; - A0053FA9189B2BEA0035A564 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - A0053FAA189B2BEA0035A564 /* CCCommon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCCommon.cpp; sourceTree = ""; }; - A0053FAB189B2BEA0035A564 /* CCDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCDevice.cpp; sourceTree = ""; }; - A0053FAC189B2BEA0035A564 /* CCFileUtilsWin32.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtilsWin32.cpp; sourceTree = ""; }; - A0053FAD189B2BEA0035A564 /* CCFileUtilsWin32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsWin32.h; sourceTree = ""; }; - A0053FAE189B2BEA0035A564 /* CCGL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - A0053FB0189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - A0053FB1189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = ""; }; - A0053FB2189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - A0053FB6189B2BEA0035A564 /* CCApplication.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCApplication.cpp; sourceTree = ""; }; - A0053FB7189B2BEA0035A564 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - A0053FB8189B2BEA0035A564 /* CCCommon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCCommon.cpp; sourceTree = ""; }; - A0053FB9189B2BEA0035A564 /* CCDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCDevice.cpp; sourceTree = ""; }; - A0053FBA189B2BEA0035A564 /* CCFileUtilsLinux.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtilsLinux.cpp; sourceTree = ""; }; - A0053FBB189B2BEA0035A564 /* CCFileUtilsLinux.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsLinux.h; sourceTree = ""; }; - A0053FBC189B2BEA0035A564 /* CCGL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - A0053FBF189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = ""; }; - A0053FC0189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; 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; }; A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A04583F0189053B500E32FE8 /* CCGLView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCGLView.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - A04583F1189053B500E32FE8 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCGLView.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathUtil.cpp; sourceTree = ""; }; - B2AF2F8318EBAEAE00C5807C /* MathUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathUtil.h; sourceTree = ""; }; - B2AF2F8418EBAEAE00C5807C /* MathUtil.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtil.inl; sourceTree = ""; }; - B2AF2F8518EBAEAE00C5807C /* MathUtilNeon.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtilNeon.inl; sourceTree = ""; }; - B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Matrix.cpp; sourceTree = ""; }; - B2AF2F8718EBAEAE00C5807C /* Matrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Matrix.h; sourceTree = ""; }; - B2AF2F8818EBAEAE00C5807C /* Matrix.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Matrix.inl; sourceTree = ""; }; - B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Quaternion.cpp; sourceTree = ""; }; - B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Quaternion.h; sourceTree = ""; }; - B2AF2F8B18EBAEAE00C5807C /* Quaternion.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Quaternion.inl; sourceTree = ""; }; - B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vector2.cpp; sourceTree = ""; }; - B2AF2F8D18EBAEAE00C5807C /* Vector2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vector2.h; sourceTree = ""; }; - B2AF2F8E18EBAEAE00C5807C /* Vector2.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vector2.inl; sourceTree = ""; }; - B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vector3.cpp; sourceTree = ""; }; - B2AF2F9018EBAEAE00C5807C /* Vector3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vector3.h; sourceTree = ""; }; - B2AF2F9118EBAEAE00C5807C /* Vector3.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vector3.inl; sourceTree = ""; }; - B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vector4.cpp; sourceTree = ""; }; - B2AF2F9318EBAEAE00C5807C /* Vector4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vector4.h; sourceTree = ""; }; - B2AF2F9418EBAEAE00C5807C /* Vector4.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vector4.inl; sourceTree = ""; }; - B2AF2FB018EBBDA100C5807C /* CCMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMath.h; sourceTree = ""; }; + B29594AF1926D5D9003EEF37 /* ccShader_3D_Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Color.frag; sourceTree = ""; }; + B29594B01926D5D9003EEF37 /* ccShader_3D_ColorTex.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_ColorTex.frag; sourceTree = ""; }; + B29594B11926D5D9003EEF37 /* ccShader_3D_PositionTex.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_PositionTex.vert; sourceTree = ""; }; + B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCMeshCommand.cpp; sourceTree = ""; }; + B29594B31926D5EC003EEF37 /* CCMeshCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMeshCommand.h; sourceTree = ""; }; + B29594B91926D61F003EEF37 /* CCMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCMesh.cpp; sourceTree = ""; }; + B29594BA1926D61F003EEF37 /* CCMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMesh.h; sourceTree = ""; }; + B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCObjLoader.cpp; sourceTree = ""; }; + B29594BC1926D61F003EEF37 /* CCObjLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCObjLoader.h; sourceTree = ""; }; + B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSprite3D.cpp; sourceTree = ""; }; + B29594BE1926D61F003EEF37 /* CCSprite3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite3D.h; sourceTree = ""; }; + B29594BF1926D61F003EEF37 /* CCSprite3DDataCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSprite3DDataCache.cpp; sourceTree = ""; }; + B29594C01926D61F003EEF37 /* CCSprite3DDataCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite3DDataCache.h; sourceTree = ""; }; B37510451823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsBodyInfo_chipmunk.cpp; sourceTree = ""; }; B37510461823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsBodyInfo_chipmunk.h; sourceTree = ""; }; B37510471823AC7B00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsContactInfo_chipmunk.cpp; sourceTree = ""; }; @@ -2925,9 +2925,12 @@ children = ( 46A15FCC1807A544005B8026 /* AUTHORS */, 1A57FFF7180BC5160088DEC7 /* CHANGELOG */, + 50272539190BF1B900AAF4ED /* cocos2d.cpp */, + 50272538190BF1B900AAF4ED /* cocos2d.h */, 46A15FCE1807A544005B8026 /* README.md */, 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */, 46A169A11807B037005B8026 /* 2d */, + B29594B81926D61F003EEF37 /* 3d */, 46A15FD01807A56F005B8026 /* audio */, 1A5700A2180BC5E60088DEC7 /* base */, 1A01C67518F57BE800EFE3A6 /* deprecated */, @@ -2938,12 +2941,11 @@ 46A170851807CE87005B8026 /* math */, 1AAF5360180E3374000584C8 /* network */, 46A170611807CE7A005B8026 /* physics */, + 50ABBEDB1926664700A911A9 /* platform */, 1551A340158F2AB200E66CFE /* Products */, 500DC89819105D41007B91BF /* renderer */, 1AAF5849180E40B8000584C8 /* storage */, 2905F9E618CF08D000240AA3 /* ui */, - 50272538190BF1B900AAF4ED /* cocos2d.h */, - 50272539190BF1B900AAF4ED /* cocos2d.cpp */, ); sourceTree = ""; }; @@ -3057,81 +3059,103 @@ 1A5700A2180BC5E60088DEC7 /* base */ = { isa = PBXGroup; children = ( - 500DC8E719106300007B91BF /* atitc.cpp */, - 500DC8E819106300007B91BF /* atitc.h */, - 500DC8E919106300007B91BF /* base64.cpp */, - 500DC8EA19106300007B91BF /* base64.h */, - 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */, - 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */, - 500DC8ED19106300007B91BF /* ccConfig.h */, - 500DC8EE19106300007B91BF /* CCConfiguration.cpp */, - 500DC8EF19106300007B91BF /* CCConfiguration.h */, - 500DC8F019106300007B91BF /* CCConsole.cpp */, - 500DC8F119106300007B91BF /* CCConsole.h */, - 500DC8F219106300007B91BF /* CCData.cpp */, - 500DC8F319106300007B91BF /* CCData.h */, - 500DC8F419106300007B91BF /* CCDataVisitor.cpp */, - 500DC8F519106300007B91BF /* CCDataVisitor.h */, - 500DC8F619106300007B91BF /* CCDirector.cpp */, - 500DC8F719106300007B91BF /* CCDirector.h */, - 500DC8F819106300007B91BF /* CCEvent.cpp */, - 500DC8F919106300007B91BF /* CCEvent.h */, - 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */, - 500DC8FB19106300007B91BF /* CCEventAcceleration.h */, - 500DC8FC19106300007B91BF /* CCEventCustom.cpp */, - 500DC8FD19106300007B91BF /* CCEventCustom.h */, - 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */, - 500DC8FF19106300007B91BF /* CCEventDispatcher.h */, - 500DC90019106300007B91BF /* CCEventKeyboard.cpp */, - 500DC90119106300007B91BF /* CCEventKeyboard.h */, - 500DC90219106300007B91BF /* CCEventListener.cpp */, - 500DC90319106300007B91BF /* CCEventListener.h */, - 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */, - 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */, - 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */, - 500DC90719106300007B91BF /* CCEventListenerCustom.h */, - 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */, - 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */, - 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */, - 500DC90B19106300007B91BF /* CCEventListenerMouse.h */, - 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */, - 500DC90D19106300007B91BF /* CCEventListenerTouch.h */, - 500DC90E19106300007B91BF /* CCEventMouse.cpp */, - 500DC90F19106300007B91BF /* CCEventMouse.h */, - 500DC91019106300007B91BF /* CCEventTouch.cpp */, - 500DC91119106300007B91BF /* CCEventTouch.h */, - 500DC91219106300007B91BF /* CCEventType.h */, - 500DC91319106300007B91BF /* ccMacros.h */, - 500DC91419106300007B91BF /* CCMap.h */, - 500DC91519106300007B91BF /* CCNS.cpp */, - 500DC91619106300007B91BF /* CCNS.h */, - 500DC91719106300007B91BF /* CCPlatformConfig.h */, - 500DC91819106300007B91BF /* CCPlatformMacros.h */, - 500DC9BA19106E89007B91BF /* CCProfiling.cpp */, - 500DC9BB19106E89007B91BF /* CCProfiling.h */, - 500DC91919106300007B91BF /* CCRef.cpp */, - 500DC91A19106300007B91BF /* CCRef.h */, - 500DC91B19106300007B91BF /* CCRefPtr.h */, - 500DC91C19106300007B91BF /* CCScheduler.cpp */, - 500DC91D19106300007B91BF /* CCScheduler.h */, - 500DC9AE1910633C007B91BF /* CCTouch.cpp */, - 500DC9AF1910633C007B91BF /* CCTouch.h */, - 500DC91E19106300007B91BF /* ccTypes.cpp */, - 500DC91F19106300007B91BF /* ccTypes.h */, - 500DC92019106300007B91BF /* CCValue.cpp */, - 500DC92119106300007B91BF /* CCValue.h */, - 500DC92219106300007B91BF /* CCVector.h */, - 500DC92319106300007B91BF /* CMakeLists.txt */, - 500DC92419106300007B91BF /* etc1.cpp */, - 500DC92519106300007B91BF /* etc1.h */, - 500DC92619106300007B91BF /* s3tc.cpp */, - 500DC92719106300007B91BF /* s3tc.h */, - 500DC92819106300007B91BF /* ZipUtils.cpp */, - 500DC92919106300007B91BF /* ZipUtils.h */, - 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */, - 296CAD211915EC8000C64FBF /* CCEventFocus.h */, - 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */, - 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */, + 50ABBDC11925AB6E00A911A9 /* atitc.cpp */, + 50ABBDC21925AB6E00A911A9 /* atitc.h */, + 50ABBDC31925AB6E00A911A9 /* base64.cpp */, + 50ABBDC41925AB6E00A911A9 /* base64.h */, + 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */, + 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */, + 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */, + 50ABBDC81925AB6E00A911A9 /* ccCArray.h */, + 50ABBDC91925AB6E00A911A9 /* ccConfig.h */, + 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */, + 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */, + 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */, + 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */, + 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */, + 50ABBDCF1925AB6E00A911A9 /* CCData.h */, + 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */, + 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */, + 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */, + 50ABBDD31925AB6E00A911A9 /* CCDirector.h */, + 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */, + 50ABBDD51925AB6E00A911A9 /* CCEvent.h */, + 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */, + 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */, + 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */, + 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */, + 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */, + 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */, + 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */, + 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */, + 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */, + 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */, + 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */, + 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */, + 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */, + 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */, + 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */, + 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */, + 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */, + 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */, + 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */, + 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */, + 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */, + 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */, + 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */, + 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */, + 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */, + 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */, + 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */, + 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */, + 50ABBDF21925AB6E00A911A9 /* CCEventType.h */, + 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */, + 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */, + 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */, + 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */, + 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */, + 50ABBDF51925AB6E00A911A9 /* ccMacros.h */, + 50ABBDF61925AB6E00A911A9 /* CCMap.h */, + 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */, + 50ABBDF81925AB6E00A911A9 /* CCNS.h */, + 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */, + 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */, + 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */, + 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */, + 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */, + 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */, + 50ABBDFF1925AB6E00A911A9 /* CCRef.h */, + 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */, + 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */, + 50ABBE021925AB6E00A911A9 /* CCScheduler.h */, + 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */, + 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */, + 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */, + 50ABBE061925AB6E00A911A9 /* CCTouch.h */, + 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */, + 50ABBE081925AB6E00A911A9 /* ccTypes.h */, + 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */, + 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */, + 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */, + 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */, + 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */, + 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */, + 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */, + 50ABBE101925AB6F00A911A9 /* ccUtils.h */, + 50ABBE111925AB6F00A911A9 /* CCValue.cpp */, + 50ABBE121925AB6F00A911A9 /* CCValue.h */, + 50ABBE131925AB6F00A911A9 /* CCVector.h */, + 50ABBE141925AB6F00A911A9 /* etc1.cpp */, + 50ABBE151925AB6F00A911A9 /* etc1.h */, + 50ABBE161925AB6F00A911A9 /* firePngData.h */, + 50ABBE171925AB6F00A911A9 /* s3tc.cpp */, + 50ABBE181925AB6F00A911A9 /* s3tc.h */, + 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */, + 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */, + 50ABBE1B1925AB6F00A911A9 /* uthash.h */, + 50ABBE1C1925AB6F00A911A9 /* utlist.h */, + 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */, + 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */, ); name = base; path = ../cocos/2d; @@ -3248,15 +3272,6 @@ name = "particle-nodes"; sourceTree = ""; }; - 1A570231180BCC380088DEC7 /* script-support */ = { - isa = PBXGroup; - children = ( - 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */, - 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */, - ); - name = "script-support"; - sourceTree = ""; - }; 1A570275180BCC840088DEC7 /* sprite-nodes */ = { isa = PBXGroup; children = ( @@ -3279,16 +3294,10 @@ 1A57029A180BCD4F0088DEC7 /* support */ = { isa = PBXGroup; children = ( - 1A57032A180BCFBC0088DEC7 /* user-default */, - 1A570321180BCF580088DEC7 /* image-support */, - 1A570314180BCF1C0088DEC7 /* data-support */, - 1A570307180BCEFB0088DEC7 /* component */, - 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */, - 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */, - 1A570304180BCED90088DEC7 /* ccUtils.cpp */, - 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */, - 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */, - 1A5702B4180BCDF40088DEC7 /* CCVertex.h */, + 1A570308180BCF190088DEC7 /* CCComponent.cpp */, + 1A570309180BCF190088DEC7 /* CCComponent.h */, + 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */, + 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */, ); name = support; sourceTree = ""; @@ -3298,9 +3307,6 @@ children = ( 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */, 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */, - 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */, - 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */, - 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */, ); name = "text-input-node"; sourceTree = ""; @@ -3308,12 +3314,6 @@ 1A5702CC180BCE410088DEC7 /* textures */ = { isa = PBXGroup; children = ( - 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */, - 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */, - 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */, - 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */, - 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */, - 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */, ); name = textures; sourceTree = ""; @@ -3337,48 +3337,6 @@ name = "tilemap-parallax-nodes"; sourceTree = ""; }; - 1A570307180BCEFB0088DEC7 /* component */ = { - isa = PBXGroup; - children = ( - 1A570308180BCF190088DEC7 /* CCComponent.cpp */, - 1A570309180BCF190088DEC7 /* CCComponent.h */, - 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */, - 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */, - ); - name = component; - sourceTree = ""; - }; - 1A570314180BCF1C0088DEC7 /* data-support */ = { - isa = PBXGroup; - children = ( - 1A570315180BCF430088DEC7 /* ccCArray.cpp */, - 1A570316180BCF430088DEC7 /* ccCArray.h */, - 1A570317180BCF430088DEC7 /* uthash.h */, - 1A570318180BCF430088DEC7 /* utlist.h */, - ); - name = "data-support"; - sourceTree = ""; - }; - 1A570321180BCF580088DEC7 /* image-support */ = { - isa = PBXGroup; - children = ( - 1A570322180BCF660088DEC7 /* TGAlib.cpp */, - 1A570323180BCF660088DEC7 /* TGAlib.h */, - ); - name = "image-support"; - sourceTree = ""; - }; - 1A57032A180BCFBC0088DEC7 /* user-default */ = { - isa = PBXGroup; - children = ( - 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */, - 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */, - 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */, - 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */, - ); - name = "user-default"; - sourceTree = ""; - }; 1A57033E180BD0490088DEC7 /* external */ = { isa = PBXGroup; children = ( @@ -3966,7 +3924,8 @@ 2905F9E618CF08D000240AA3 /* ui */ = { isa = PBXGroup; children = ( - 2928C2041923757900E77353 /* Layout */, + 29CB8F4A1929D1BB00C841D6 /* UILayoutExecutant.cpp */, + 29CB8F4B1929D1BB00C841D6 /* UILayoutExecutant.h */, 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */, 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */, 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */, @@ -3980,6 +3939,10 @@ 2905F9F518CF08D000240AA3 /* UIHelper.h */, 2905F9F618CF08D000240AA3 /* UIImageView.cpp */, 2905F9F718CF08D000240AA3 /* UIImageView.h */, + 2905F9F818CF08D000240AA3 /* UILayout.cpp */, + 2905F9F918CF08D000240AA3 /* UILayout.h */, + 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */, + 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */, 2905F9FE18CF08D000240AA3 /* UIListView.cpp */, 2905F9FF18CF08D000240AA3 /* UIListView.h */, 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */, @@ -4005,29 +3968,16 @@ 2905FA1418CF08D100240AA3 /* UIWidget.h */, 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */, 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */, - 29080DEB191B82CE0066F8DF /* UIDeprecated.h */, - ); - name = ui; - path = ../cocos/ui; - sourceTree = ""; - }; - 2928C2041923757900E77353 /* Layout */ = { - isa = PBXGroup; - children = ( 50E6D32E18E174130051CA34 /* UIHBox.cpp */, 50E6D32F18E174130051CA34 /* UIHBox.h */, 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */, 50E6D33118E174130051CA34 /* UIRelativeBox.h */, 50E6D33218E174130051CA34 /* UIVBox.cpp */, 50E6D33318E174130051CA34 /* UIVBox.h */, - 2905F9F818CF08D000240AA3 /* UILayout.cpp */, - 2905F9F918CF08D000240AA3 /* UILayout.h */, - 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */, - 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */, - 2928C1FE1923756F00E77353 /* UILayoutExecutant.cpp */, - 2928C1FF1923756F00E77353 /* UILayoutExecutant.h */, + 29080DEB191B82CE0066F8DF /* UIDeprecated.h */, ); - name = Layout; + name = ui; + path = ../cocos/ui; sourceTree = ""; }; 37936A361869B76800E974DD /* internal */ = { @@ -4448,12 +4398,8 @@ 46A169A11807B037005B8026 /* 2d */ = { isa = PBXGroup; children = ( - 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */, - 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */, 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */, 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */, - 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */, - 1A9DCA0C180E6955007A3AD4 /* firePngData.h */, 1A570046180BC59A0088DEC7 /* actions */, 1A570095180BC5B00088DEC7 /* base-nodes */, 1A570109180BC8DC0088DEC7 /* draw-nodes */, @@ -4463,8 +4409,6 @@ 1A5701F2180BCB970088DEC7 /* menu-nodes */, 1A5701FF180BCBBD0088DEC7 /* misc-nodes */, 1A570218180BCC000088DEC7 /* particle-nodes */, - 46A16A5A1807B038005B8026 /* platform */, - 1A570231180BCC380088DEC7 /* script-support */, 1A570275180BCC840088DEC7 /* sprite-nodes */, 1A57029A180BCD4F0088DEC7 /* support */, 1A5702BC180BCE0A0088DEC7 /* text-input-node */, @@ -4475,84 +4419,6 @@ path = ../cocos/2d; sourceTree = ""; }; - 46A16A5A1807B038005B8026 /* platform */ = { - isa = PBXGroup; - children = ( - A0053F45189B2BEA0035A564 /* android */, - 46A16A8E1807B038005B8026 /* apple */, - 46A16A941807B038005B8026 /* CCApplicationProtocol.h */, - 46A16A951807B038005B8026 /* CCCommon.h */, - 46A16A961807B038005B8026 /* CCDevice.h */, - 46A16A991807B038005B8026 /* CCFileUtils.cpp */, - 46A16A9A1807B038005B8026 /* CCFileUtils.h */, - 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */, - 46A16A981807B038005B8026 /* CCGLViewProtocol.h */, - 3E26D40418ACB5D100834404 /* CCImage.cpp */, - 46A16A9B1807B038005B8026 /* CCImage.h */, - 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */, - 46A16AA01807B038005B8026 /* CCSAXParser.h */, - 46A16AA11807B038005B8026 /* CCThread.cpp */, - 46A16AA21807B038005B8026 /* CCThread.h */, - A04583EF189053B500E32FE8 /* desktop */, - 46A16AA31807B038005B8026 /* ios */, - A0053FB5189B2BEA0035A564 /* linux */, - 46A16AC71807B038005B8026 /* mac */, - A0053FA7189B2BEA0035A564 /* win32 */, - ); - path = platform; - sourceTree = ""; - }; - 46A16A8E1807B038005B8026 /* apple */ = { - isa = PBXGroup; - children = ( - 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */, - 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */, - 46A16A911807B038005B8026 /* CCLock.cpp */, - 46A16A921807B038005B8026 /* CCLock.h */, - 46A16A931807B038005B8026 /* CCThread.mm */, - ); - path = apple; - sourceTree = ""; - }; - 46A16AA31807B038005B8026 /* ios */ = { - isa = PBXGroup; - children = ( - 46A16AA41807B038005B8026 /* CCApplication.h */, - 46A16AA51807B038005B8026 /* CCApplication.mm */, - 46A16AA61807B038005B8026 /* CCCommon.mm */, - 46A16AA71807B038005B8026 /* CCDevice.mm */, - 46A16AA81807B038005B8026 /* CCDirectorCaller.h */, - 46A16AA91807B038005B8026 /* CCDirectorCaller.mm */, - 46A16AAA1807B038005B8026 /* CCGLView.h */, - 46A16AAB1807B038005B8026 /* CCGLView.mm */, - 46A16AAC1807B038005B8026 /* CCES2Renderer.h */, - 46A16AAD1807B038005B8026 /* CCES2Renderer.m */, - 46A16AAE1807B038005B8026 /* CCESRenderer.h */, - 1A0DB7301823827C0025743D /* CCGL.h */, - 46A16AB01807B038005B8026 /* CCImage.mm */, - 46A16AB11807B038005B8026 /* CCPlatformDefine.h */, - 46A16AB21807B038005B8026 /* CCStdC.h */, - 1A0DB7311823827C0025743D /* CCEAGLView.h */, - 46A16AB41807B038005B8026 /* CCEAGLView.mm */, - 46A16AB51807B038005B8026 /* OpenGL_Internal.h */, - ); - path = ios; - sourceTree = ""; - }; - 46A16AC71807B038005B8026 /* mac */ = { - isa = PBXGroup; - children = ( - 3E26D40718ACB63900834404 /* CCDevice.mm */, - 46A16AC81807B038005B8026 /* CCApplication.h */, - 46A16AC91807B038005B8026 /* CCApplication.mm */, - 46A16ACA1807B038005B8026 /* CCCommon.mm */, - 1A0DB7351823828F0025743D /* CCGL.h */, - 46A16AD41807B038005B8026 /* CCPlatformDefine.h */, - 46A16AD51807B038005B8026 /* CCStdC.h */, - ); - path = mac; - sourceTree = ""; - }; 46A170611807CE7A005B8026 /* physics */ = { isa = PBXGroup; children = ( @@ -4593,33 +4459,35 @@ 46A170851807CE87005B8026 /* math */ = { isa = PBXGroup; children = ( - 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */, - 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */, - 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */, - 500DC8CF19105F7D007B91BF /* CCGeometry.h */, - 500DC8D019105F7D007B91BF /* CCMathBase.h */, - B2AF2FB018EBBDA100C5807C /* CCMath.h */, - B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */, - B2AF2F8318EBAEAE00C5807C /* MathUtil.h */, - B2AF2F8418EBAEAE00C5807C /* MathUtil.inl */, - B2AF2F8518EBAEAE00C5807C /* MathUtilNeon.inl */, - B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */, - B2AF2F8718EBAEAE00C5807C /* Matrix.h */, - B2AF2F8818EBAEAE00C5807C /* Matrix.inl */, - B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */, - B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */, - B2AF2F8B18EBAEAE00C5807C /* Quaternion.inl */, - 500DC9B419106E6D007B91BF /* TransformUtils.cpp */, - 500DC9B519106E6D007B91BF /* TransformUtils.h */, - B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */, - B2AF2F8D18EBAEAE00C5807C /* Vector2.h */, - B2AF2F8E18EBAEAE00C5807C /* Vector2.inl */, - B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */, - B2AF2F9018EBAEAE00C5807C /* Vector3.h */, - B2AF2F9118EBAEAE00C5807C /* Vector3.inl */, - B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */, - B2AF2F9318EBAEAE00C5807C /* Vector4.h */, - B2AF2F9418EBAEAE00C5807C /* Vector4.inl */, + 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */, + 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */, + 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */, + 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */, + 50ABBD1F1925AB0000A911A9 /* CCMath.h */, + 50ABBD201925AB0000A911A9 /* CCMathBase.h */, + 50ABBD211925AB0000A911A9 /* CCVertex.cpp */, + 50ABBD221925AB0000A911A9 /* CCVertex.h */, + 50ABBD231925AB0000A911A9 /* Mat4.cpp */, + 50ABBD241925AB0000A911A9 /* Mat4.h */, + 50ABBD251925AB0000A911A9 /* Mat4.inl */, + 50ABBD261925AB0000A911A9 /* MathUtil.cpp */, + 50ABBD271925AB0000A911A9 /* MathUtil.h */, + 50ABBD281925AB0000A911A9 /* MathUtil.inl */, + 50ABBD291925AB0000A911A9 /* MathUtilNeon.inl */, + 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */, + 50ABBD2B1925AB0000A911A9 /* Quaternion.h */, + 50ABBD2C1925AB0000A911A9 /* Quaternion.inl */, + 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */, + 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */, + 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */, + 50ABBD301925AB0000A911A9 /* Vec2.h */, + 50ABBD311925AB0000A911A9 /* Vec2.inl */, + 50ABBD321925AB0000A911A9 /* Vec3.cpp */, + 50ABBD331925AB0000A911A9 /* Vec3.h */, + 50ABBD341925AB0000A911A9 /* Vec3.inl */, + 50ABBD351925AB0000A911A9 /* Vec4.cpp */, + 50ABBD361925AB0000A911A9 /* Vec4.h */, + 50ABBD371925AB0000A911A9 /* Vec4.inl */, ); name = math; path = ../cocos/math; @@ -4638,32 +4506,40 @@ 500DC89819105D41007B91BF /* renderer */ = { isa = PBXGroup; children = ( + 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */, + 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */, + 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */, + 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */, + 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */, + 50ABBD691925AB4100A911A9 /* CCGLProgram.h */, + 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */, + 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */, + 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */, + 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */, + 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */, + 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */, + 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */, + 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */, + 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */, + 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */, + B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */, + B29594B31926D5EC003EEF37 /* CCMeshCommand.h */, + 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */, + 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */, + 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */, + 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */, + 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */, + 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */, + 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */, + 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */, + 50ABBD7C1925AB4100A911A9 /* ccShaders.h */, + 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */, + 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */, + 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */, + 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */, + 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */, + 50ABBD821925AB4100A911A9 /* CCTextureCache.h */, 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 */, - 500DC89C19105D41007B91BF /* CCCustomCommand.h */, - 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */, - 500DC89E19105D41007B91BF /* CCGroupCommand.h */, - 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */, - 500DC8A219105D41007B91BF /* CCQuadCommand.h */, - 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */, - 500DC8A419105D41007B91BF /* CCRenderCommand.h */, - 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */, - 500DC8A619105D41007B91BF /* CCRenderer.cpp */, - 500DC8A719105D41007B91BF /* CCRenderer.h */, ); name = renderer; path = ../cocos/renderer; @@ -4672,6 +4548,9 @@ 5034CA5D191D591900CE6051 /* shaders */ = { isa = PBXGroup; children = ( + B29594AF1926D5D9003EEF37 /* ccShader_3D_Color.frag */, + B29594B01926D5D9003EEF37 /* ccShader_3D_ColorTex.frag */, + B29594B11926D5D9003EEF37 /* ccShader_3D_PositionTex.vert */, 5034CA60191D91CF00CE6051 /* ccShader_PositionTextureColor.vert */, 5034CA61191D91CF00CE6051 /* ccShader_PositionTextureColor.frag */, 5034CA62191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.vert */, @@ -4698,6 +4577,91 @@ name = shaders; sourceTree = ""; }; + 503DD8CD1926736A00CD74DD /* ios */ = { + isa = PBXGroup; + children = ( + 503DD8CE1926736A00CD74DD /* CCApplication.h */, + 503DD8CF1926736A00CD74DD /* CCApplication.mm */, + 503DD8D01926736A00CD74DD /* CCCommon.mm */, + 503DD8D11926736A00CD74DD /* CCDevice.mm */, + 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */, + 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */, + 503DD8D41926736A00CD74DD /* CCEAGLView.h */, + 503DD8D51926736A00CD74DD /* CCEAGLView.mm */, + 503DD8D61926736A00CD74DD /* CCES2Renderer.h */, + 503DD8D71926736A00CD74DD /* CCES2Renderer.m */, + 503DD8D81926736A00CD74DD /* CCESRenderer.h */, + 503DD8D91926736A00CD74DD /* CCGL.h */, + 503DD8DA1926736A00CD74DD /* CCGLView.h */, + 503DD8DB1926736A00CD74DD /* CCGLView.mm */, + 503DD8DC1926736A00CD74DD /* CCImage.mm */, + 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */, + 503DD8DE1926736A00CD74DD /* CCStdC.h */, + 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */, + ); + path = ios; + sourceTree = ""; + }; + 50ABBEDB1926664700A911A9 /* platform */ = { + isa = PBXGroup; + children = ( + 503DD8CD1926736A00CD74DD /* ios */, + 50ABBF2D1926664700A911A9 /* desktop */, + 50ABBF4E1926664700A911A9 /* mac */, + 50ABBF1A1926664700A911A9 /* apple */, + 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */, + 50ABBF211926664700A911A9 /* CCCommon.h */, + 50ABBF221926664700A911A9 /* CCDevice.h */, + 50ABBF231926664700A911A9 /* CCFileUtils.cpp */, + 50ABBF241926664700A911A9 /* CCFileUtils.h */, + 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */, + 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */, + 50ABBF271926664700A911A9 /* CCImage.cpp */, + 50ABBF281926664700A911A9 /* CCImage.h */, + 50ABBF291926664700A911A9 /* CCSAXParser.cpp */, + 50ABBF2A1926664700A911A9 /* CCSAXParser.h */, + 50ABBF2B1926664700A911A9 /* CCThread.cpp */, + 50ABBF2C1926664700A911A9 /* CCThread.h */, + ); + name = platform; + path = ../cocos/platform; + sourceTree = ""; + }; + 50ABBF1A1926664700A911A9 /* apple */ = { + isa = PBXGroup; + children = ( + 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */, + 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */, + 50ABBF1D1926664700A911A9 /* CCLock.cpp */, + 50ABBF1E1926664700A911A9 /* CCLock.h */, + 50ABBF1F1926664700A911A9 /* CCThread.mm */, + ); + path = apple; + sourceTree = ""; + }; + 50ABBF2D1926664700A911A9 /* desktop */ = { + isa = PBXGroup; + children = ( + 50ABBF2E1926664700A911A9 /* CCGLView.cpp */, + 50ABBF2F1926664700A911A9 /* CCGLView.h */, + ); + path = desktop; + sourceTree = ""; + }; + 50ABBF4E1926664700A911A9 /* mac */ = { + isa = PBXGroup; + children = ( + 50ABBF4F1926664700A911A9 /* CCApplication.h */, + 50ABBF501926664700A911A9 /* CCApplication.mm */, + 50ABBF511926664700A911A9 /* CCCommon.mm */, + 50ABBF521926664700A911A9 /* CCDevice.mm */, + 50ABBF531926664700A911A9 /* CCGL.h */, + 50ABBF541926664700A911A9 /* CCPlatformDefine.h */, + 50ABBF551926664700A911A9 /* CCStdC.h */, + ); + path = mac; + sourceTree = ""; + }; 50FCEB6818C72017004AD434 /* WidgetReader */ = { isa = PBXGroup; children = ( @@ -4838,66 +4802,20 @@ path = TextReader; sourceTree = ""; }; - A0053F45189B2BEA0035A564 /* android */ = { + B29594B81926D61F003EEF37 /* 3d */ = { isa = PBXGroup; children = ( - A0053F46189B2BEA0035A564 /* Android.mk */, - A0053F47189B2BEA0035A564 /* CCApplication.cpp */, - A0053F48189B2BEA0035A564 /* CCApplication.h */, - A0053F49189B2BEA0035A564 /* CCCommon.cpp */, - A0053F4A189B2BEA0035A564 /* CCDevice.cpp */, - A0053F4B189B2BEA0035A564 /* CCFileUtilsAndroid.cpp */, - A0053F4C189B2BEA0035A564 /* CCFileUtilsAndroid.h */, - A0053F4D189B2BEA0035A564 /* CCGL.h */, - A0053F4E189B2BEA0035A564 /* CCGLView.cpp */, - A0053F4F189B2BEA0035A564 /* CCGLView.h */, - A0053F51189B2BEA0035A564 /* CCPlatformDefine.h */, - A0053F52189B2BEA0035A564 /* CCStdC.h */, + B29594B91926D61F003EEF37 /* CCMesh.cpp */, + B29594BA1926D61F003EEF37 /* CCMesh.h */, + B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */, + B29594BC1926D61F003EEF37 /* CCObjLoader.h */, + B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */, + B29594BE1926D61F003EEF37 /* CCSprite3D.h */, + B29594BF1926D61F003EEF37 /* CCSprite3DDataCache.cpp */, + B29594C01926D61F003EEF37 /* CCSprite3DDataCache.h */, ); - path = android; - sourceTree = ""; - }; - A0053FA7189B2BEA0035A564 /* win32 */ = { - isa = PBXGroup; - children = ( - A0053FA8189B2BEA0035A564 /* CCApplication.cpp */, - A0053FA9189B2BEA0035A564 /* CCApplication.h */, - A0053FAA189B2BEA0035A564 /* CCCommon.cpp */, - A0053FAB189B2BEA0035A564 /* CCDevice.cpp */, - A0053FAC189B2BEA0035A564 /* CCFileUtilsWin32.cpp */, - A0053FAD189B2BEA0035A564 /* CCFileUtilsWin32.h */, - A0053FAE189B2BEA0035A564 /* CCGL.h */, - A0053FB0189B2BEA0035A564 /* CCPlatformDefine.h */, - A0053FB1189B2BEA0035A564 /* CCStdC.cpp */, - A0053FB2189B2BEA0035A564 /* CCStdC.h */, - ); - path = win32; - sourceTree = ""; - }; - A0053FB5189B2BEA0035A564 /* linux */ = { - isa = PBXGroup; - children = ( - A0053FB6189B2BEA0035A564 /* CCApplication.cpp */, - A0053FB7189B2BEA0035A564 /* CCApplication.h */, - A0053FB8189B2BEA0035A564 /* CCCommon.cpp */, - A0053FB9189B2BEA0035A564 /* CCDevice.cpp */, - A0053FBA189B2BEA0035A564 /* CCFileUtilsLinux.cpp */, - A0053FBB189B2BEA0035A564 /* CCFileUtilsLinux.h */, - A0053FBC189B2BEA0035A564 /* CCGL.h */, - A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */, - A0053FBF189B2BEA0035A564 /* CCStdC.cpp */, - A0053FC0189B2BEA0035A564 /* CCStdC.h */, - ); - path = linux; - sourceTree = ""; - }; - A04583EF189053B500E32FE8 /* desktop */ = { - isa = PBXGroup; - children = ( - A04583F0189053B500E32FE8 /* CCGLView.cpp */, - A04583F1189053B500E32FE8 /* CCGLView.h */, - ); - path = desktop; + name = 3d; + path = ../cocos/3d; sourceTree = ""; }; B3D8D4471799219B0039C204 /* mac */ = { @@ -4935,50 +4853,41 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 50ABBE9B1925AB6F00A911A9 /* CCRef.h in Headers */, + 50ABBE851925AB6F00A911A9 /* ccFPSImages.h in Headers */, 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */, + 50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */, + 29CB8F4E1929D1BB00C841D6 /* UILayoutExecutant.h in Headers */, 2AC795E018628723005EC8E1 /* Event.h in Headers */, 2AC795E118628723005EC8E1 /* EventData.h in Headers */, 50E6D33618E174130051CA34 /* UIHBox.h in Headers */, - 500DC94A19106300007B91BF /* CCDirector.h in Headers */, - 500DC97A19106300007B91BF /* CCEventMouse.h in Headers */, + 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */, 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */, 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */, 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */, + 50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */, + B29594D01926D61F003EEF37 /* CCSprite3DDataCache.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */, 5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, - 2928C2021923756F00E77353 /* UILayoutExecutant.h in Headers */, - 500DC8B419105D41007B91BF /* CCGroupCommand.h in Headers */, - 500DC8D319105F7D007B91BF /* CCAffineTransform.h in Headers */, - 46A170191807CBFC005B8026 /* CCCommon.h in Headers */, + 50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */, 46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */, 2905FA4818CF08D100240AA3 /* UIButton.h in Headers */, 46A170EB1807CECA005B8026 /* CCPhysicsJoint.h in Headers */, - 46A170241807CBFC005B8026 /* CCSAXParser.h in Headers */, - 46A1701A1807CBFC005B8026 /* CCDevice.h in Headers */, - B2AF2F9F18EBAEAE00C5807C /* Quaternion.h in Headers */, - 46A170161807CBFC005B8026 /* CCLock.h in Headers */, - 46A1701C1807CBFC005B8026 /* CCGLViewProtocol.h in Headers */, - 46A1701E1807CBFC005B8026 /* CCFileUtils.h in Headers */, + 50ABBD3E1925AB0000A911A9 /* CCGeometry.h in Headers */, + 50ABBE631925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */, 2905FA4418CF08D100240AA3 /* GUIDefine.h in Headers */, B37510771823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */, - 46A1705B1807CC1C005B8026 /* CCPlatformDefine.h in Headers */, 46A170EE1807CECA005B8026 /* CCPhysicsShape.h in Headers */, 2905FA5018CF08D100240AA3 /* UIHelper.h in Headers */, - 46A170261807CBFC005B8026 /* CCThread.h in Headers */, + 50ABBED31925AB6F00A911A9 /* uthash.h in Headers */, 46A170E91807CECA005B8026 /* CCPhysicsContact.h in Headers */, B375107B1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, 2905FA6818CF08D100240AA3 /* UILoadingBar.h in Headers */, - 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 */, - 46A170131807CBFC005B8026 /* CCFileUtilsApple.h in Headers */, - 46A1701F1807CBFC005B8026 /* CCImage.h in Headers */, - 46A170181807CBFC005B8026 /* CCApplicationProtocol.h in Headers */, + 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */, + 50ABBE871925AB6F00A911A9 /* ccMacros.h in Headers */, + 50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, 1A570063180BC5A10088DEC7 /* CCAction.h in Headers */, 1A570067180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006B180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, @@ -4989,48 +4898,40 @@ 06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, - 500DC8BC19105D41007B91BF /* CCQuadCommand.h in Headers */, - 500DC94E19106300007B91BF /* CCEvent.h in Headers */, 1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */, - 296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, 1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */, 1A570087180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, + 50ABBD911925AB4100A911A9 /* CCGLProgramCache.h in Headers */, ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */, + 50ABBEC31925AB6F00A911A9 /* CCVector.h in Headers */, 1A57008B180BC5A10088DEC7 /* CCActionProgressTimer.h in Headers */, - 500DC96E19106300007B91BF /* CCEventListenerKeyboard.h in Headers */, - 1A0DB7381823828F0025743D /* CCGL.h in Headers */, + 50ABBD8D1925AB4100A911A9 /* CCGLProgram.h in Headers */, + 50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */, + 50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */, 2905FA6C18CF08D100240AA3 /* UIPageView.h in Headers */, 50FCEB9518C72017004AD434 /* ButtonReader.h in Headers */, + 50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */, 1A57008F180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */, 1A570093180BC5A10088DEC7 /* CCActionTween.h in Headers */, - 500DC8C019105D41007B91BF /* CCRenderCommand.h in Headers */, + 50ABBD4A1925AB0000A911A9 /* Mat4.h in Headers */, 1A57009A180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, 1A5700A0180BC5D20088DEC7 /* CCNode.h in Headers */, + 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */, 46C02E0918E91123004B7456 /* xxhash.h in Headers */, - B2AF2FA318EBAEAE00C5807C /* Vector2.h in Headers */, 06CAAAC6186AD7E60012A414 /* TriggerObj.h in Headers */, - 500DC8B019105D41007B91BF /* CCCustomCommand.h in Headers */, - 500DC8AC19105D41007B91BF /* CCBatchCommand.h in Headers */, - A04583F3189053B500E32FE8 /* CCGLView.h in Headers */, - B2AF2FA718EBAEAE00C5807C /* Vector3.h in Headers */, 1A570110180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, - 500DC8D719105F7D007B91BF /* CCGeometry.h in Headers */, - 500DC96619106300007B91BF /* CCEventListenerAcceleration.h in Headers */, B37510791823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */, 1A570114180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, - 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 */, - 500DC9BE19106E89007B91BF /* CCProfiling.h in Headers */, 50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */, 50E6D33E18E174130051CA34 /* UIVBox.h in Headers */, - 500DC9AC19106300007B91BF /* ZipUtils.h in Headers */, 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */, + 50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */, 1A57019F180BCB590088DEC7 /* CCFont.h in Headers */, 1A5701A3180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */, @@ -5038,106 +4939,102 @@ 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 */, 1A5701BF180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */, + 50ABBED91925AB6F00A911A9 /* ZipUtils.h in Headers */, 1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, - 500DC93A19106300007B91BF /* CCConfiguration.h in Headers */, + 50ABBE5F1925AB6F00A911A9 /* CCEventListener.h in Headers */, 1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 1A5701CD180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, 1A5701E0180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E4180BCB8C0088DEC7 /* CCScene.h in Headers */, 1A01C68818F57BE800EFE3A6 /* CCBool.h in Headers */, + 50ABBEAD1925AB6F00A911A9 /* ccTypes.h in Headers */, 1A087AEA1860400400196EF5 /* edtaa3func.h in Headers */, 1A5701E8180BCB8C0088DEC7 /* CCTransition.h in Headers */, 2905FA4C18CF08D100240AA3 /* UICheckBox.h in Headers */, 1A5701EC180BCB8C0088DEC7 /* CCTransitionPageTurn.h in Headers */, 1A5701F0180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */, 1A5701F9180BCBAD0088DEC7 /* CCMenu.h in Headers */, + 50ABBD401925AB0000A911A9 /* CCMath.h in Headers */, 1A5701FD180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, 1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, 1A57020A180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */, 1A570212180BCBF40088DEC7 /* CCProgressTimer.h in Headers */, 1A570216180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, - 500DC95219106300007B91BF /* CCEventAcceleration.h in Headers */, - 500DC99E19106300007B91BF /* CCValue.h in Headers */, 1A01C69618F57BE800EFE3A6 /* CCInteger.h in Headers */, 1A570223180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, + 50ABBD891925AB4100A911A9 /* CCCustomCommand.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 */, + 50ABBE951925AB6F00A911A9 /* CCProfiling.h in Headers */, 5034CA4B191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, + 50ABBE4F1925AB6F00A911A9 /* CCEventCustom.h in Headers */, + 50ABBD521925AB0000A911A9 /* Quaternion.h in Headers */, 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, - 500DC96A19106300007B91BF /* CCEventListenerCustom.h in Headers */, - B2AF2F9718EBAEAE00C5807C /* MathUtil.h in Headers */, - 1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, - 500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */, 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */, - 500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */, 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, - 500DC9A019106300007B91BF /* CCVector.h in Headers */, - 500DC92C19106300007B91BF /* atitc.h in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, - 500DC98419106300007B91BF /* CCMap.h in Headers */, + 50ABBD561925AB0000A911A9 /* TransformUtils.h in Headers */, 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */, 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */, + 50ABBD991925AB4100A911A9 /* CCGLProgramStateCache.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 */, 1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */, + 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */, 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, 50FCEB9D18C72017004AD434 /* ImageViewReader.h in Headers */, + B29594C81926D61F003EEF37 /* CCObjLoader.h in Headers */, + 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, + 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */, + 50ABC0071926664800A911A9 /* CCApplicationProtocol.h in Headers */, 50FCEBA918C72017004AD434 /* LoadingBarReader.h in Headers */, - 500DC9B21910633C007B91BF /* CCTouch.h in Headers */, - 1A5702B1180BCDBC0088DEC7 /* ccUTF8.h in Headers */, - 1A5702B7180BCDF40088DEC7 /* CCVertex.h in Headers */, - 1A5702BA180BCDFC0088DEC7 /* ccUtils.h in Headers */, - 1A5702C0180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */, + 50ABBD4E1925AB0000A911A9 /* MathUtil.h in Headers */, 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */, - 1A5702C4180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */, + 50ABBE431925AB6F00A911A9 /* CCDirector.h in Headers */, 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */, 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, - 1A5702D5180BCE570088DEC7 /* CCTexture2D.h in Headers */, - 1A5702D9180BCE570088DEC7 /* CCTextureAtlas.h in Headers */, - 1A5702DD180BCE570088DEC7 /* CCTextureCache.h in Headers */, 1A5702EC180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 1A5702F0180BCE750088DEC7 /* CCTMXLayer.h in Headers */, + 50ABC01B1926664800A911A9 /* CCSAXParser.h in Headers */, + 50ABBED51925AB6F00A911A9 /* utlist.h in Headers */, 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */, 1A5702F4180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, + 50ABBDAF1925AB4100A911A9 /* CCRenderer.h in Headers */, 1A5702F8180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, + 50ABBDA11925AB4100A911A9 /* CCGroupCommand.h in Headers */, 1A5702FC180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */, + 50ABBDBB1925AB4100A911A9 /* CCTextureAtlas.h in Headers */, 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */, + 50ABBE4B1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, 1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */, 50FCEBC918C72017004AD434 /* WidgetReader.h in Headers */, + 50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */, + 50ABC0651926664800A911A9 /* CCGL.h in Headers */, B37510751823AC9F00B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, - 500DC94619106300007B91BF /* CCDataVisitor.h in Headers */, - B2AF2FAB18EBAEAE00C5807C /* Vector4.h in Headers */, - 1A57031B180BCF430088DEC7 /* ccCArray.h in Headers */, - 1A57031D180BCF430088DEC7 /* uthash.h in Headers */, - 1A57031F180BCF430088DEC7 /* utlist.h in Headers */, + 50ABBD621925AB0000A911A9 /* Vec4.h in Headers */, 1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */, - 1A570326180BCF660088DEC7 /* TGAlib.h in Headers */, - 1A570331180BCFD50088DEC7 /* CCUserDefault.h in Headers */, - 500DC93419106300007B91BF /* CCAutoreleasePool.h in Headers */, 2905FA5818CF08D100240AA3 /* UILayout.h in Headers */, 1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570356180BD0B00088DEC7 /* ioapi.h in Headers */, - 500DC99619106300007B91BF /* CCScheduler.h in Headers */, + B29594C41926D61F003EEF37 /* CCMesh.h in Headers */, + 50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */, + 50ABC01F1926664800A911A9 /* CCThread.h in Headers */, 1A57035A180BD0B00088DEC7 /* unzip.h in Headers */, - 296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */, - 500DC98819106300007B91BF /* CCNS.h in Headers */, 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */, + 50ABBDBF1925AB4100A911A9 /* CCTextureCache.h in Headers */, 1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */, B37510741823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, 2905FA8E18CF08D100240AA3 /* UIWidget.h in Headers */, @@ -5147,135 +5044,161 @@ 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */, 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */, 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, - 500DC98019106300007B91BF /* CCEventType.h in Headers */, + 50ABBE6F1925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */, + 50ABBE9D1925AB6F00A911A9 /* CCRefPtr.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 */, + 50ABBE7B1925AB6F00A911A9 /* CCEventMouse.h in Headers */, 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, 1AD71DD7180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, 1AD71DDB180E26E600808F54 /* CCLayerColorLoader.h in Headers */, + 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, 1AD71DDF180E26E600808F54 /* CCLayerGradientLoader.h in Headers */, 1AD71DE3180E26E600808F54 /* CCLayerLoader.h in Headers */, - 500DC97219106300007B91BF /* CCEventListenerMouse.h in Headers */, 1AD71DE7180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */, 1AD71DEB180E26E600808F54 /* CCMenuItemLoader.h in Headers */, 1AD71DED180E26E600808F54 /* CCMenuLoader.h in Headers */, + 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 1AD71DF1180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, 2905FA7218CF08D100240AA3 /* UIScrollInterface.h in Headers */, - B2AF2F9B18EBAEAE00C5807C /* Matrix.h in Headers */, 1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */, 1AD71DF9180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, + 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 2905FA8A18CF08D100240AA3 /* UITextField.h in Headers */, + 50ABBE471925AB6F00A911A9 /* CCEvent.h in Headers */, + 50ABBE6B1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, 1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, + 50ABBDA51925AB4100A911A9 /* CCQuadCommand.h in Headers */, 1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, + 50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */, 1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, - 5034CA51191D591100CE6051 /* CCGLProgramStateCache.h in Headers */, 1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */, + 50ABBE571925AB6F00A911A9 /* CCEventFocus.h in Headers */, 1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */, 1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */, 1AD71E97180E26E600808F54 /* Animation.h in Headers */, 1AD71E9B180E26E600808F54 /* AnimationState.h in Headers */, 1A01C69218F57BE800EFE3A6 /* CCDouble.h in Headers */, + 50ABBE251925AB6F00A911A9 /* base64.h in Headers */, + 50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */, + B29594CC1926D61F003EEF37 /* CCSprite3D.h in Headers */, 1AD71E9F180E26E600808F54 /* AnimationStateData.h in Headers */, 1AD71EA3180E26E600808F54 /* Atlas.h in Headers */, 1AD71EA7180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */, + 503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */, 1AD71EAB180E26E600808F54 /* Attachment.h in Headers */, - 500DC97E19106300007B91BF /* CCEventTouch.h in Headers */, 50FCEBC118C72017004AD434 /* TextFieldReader.h in Headers */, 1AD71EAF180E26E600808F54 /* AttachmentLoader.h in Headers */, 1AD71EB3180E26E600808F54 /* Bone.h in Headers */, 2905FA8218CF08D100240AA3 /* UITextAtlas.h in Headers */, 1AD71EB7180E26E600808F54 /* BoneData.h in Headers */, - 500DC99219106300007B91BF /* CCRefPtr.h in Headers */, + 50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */, 1AD71EBB180E26E600808F54 /* CCSkeleton.h in Headers */, - 500DC97619106300007B91BF /* CCEventListenerTouch.h in Headers */, 50FCEBA118C72017004AD434 /* LayoutReader.h in Headers */, + 50ABBEBD1925AB6F00A911A9 /* ccUtils.h in Headers */, 1AD71EBF180E26E600808F54 /* CCSkeletonAnimation.h in Headers */, 2905FA7018CF08D100240AA3 /* UIRichText.h in Headers */, 1AD71EC3180E26E600808F54 /* extension.h in Headers */, 50FCEBC518C72017004AD434 /* TextReader.h in Headers */, 1AD71EC7180E26E600808F54 /* Json.h in Headers */, - 500DC8D919105F7D007B91BF /* CCMathBase.h in Headers */, + 50ABC0231926664800A911A9 /* CCGLView.h in Headers */, 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */, 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */, + 50ABBFFD1926664800A911A9 /* CCFileUtilsApple.h in Headers */, 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */, 1AD71ECF180E26E600808F54 /* Skeleton.h in Headers */, 5034CA41191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, + 50ABBE7F1925AB6F00A911A9 /* CCEventTouch.h in Headers */, + 50ABBE5B1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, 1A01C69E18F57BE800EFE3A6 /* CCString.h in Headers */, - 500DC9B819106E6D007B91BF /* TransformUtils.h in Headers */, 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */, + 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */, + 50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */, 1AD71ED7180E26E600808F54 /* SkeletonJson.h in Headers */, - 500DC9A819106300007B91BF /* s3tc.h in Headers */, 1AD71EDB180E26E600808F54 /* Skin.h in Headers */, + 50ABBE3F1925AB6F00A911A9 /* CCDataVisitor.h in Headers */, 1AD71EDF180E26E600808F54 /* Slot.h in Headers */, 1AD71EE3180E26E600808F54 /* SlotData.h in Headers */, 1AD71EE7180E26E600808F54 /* spine-cocos2dx.h in Headers */, 1AD71EE9180E26E600808F54 /* spine.h in Headers */, 1AAF536C180E3374000584C8 /* HttpClient.h in Headers */, + 50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */, + 50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */, 1AAF536E180E3374000584C8 /* HttpRequest.h in Headers */, - 500DC99019106300007B91BF /* CCRef.h in Headers */, 1AAF5370180E3374000584C8 /* HttpResponse.h in Headers */, + 50ABBE671925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */, 1AAF5374180E3374000584C8 /* SocketIO.h in Headers */, + 50ABBE2F1925AB6F00A911A9 /* ccConfig.h in Headers */, 373B9129187891F400198F86 /* CCComBase.h in Headers */, 1AAF5378180E3374000584C8 /* WebSocket.h in Headers */, 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */, 1A01C69018F57BE800EFE3A6 /* CCDictionary.h in Headers */, - 1A9DCA25180E6955007A3AD4 /* ccFPSImages.h in Headers */, 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, - 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 */, + 50ABC0031926664800A911A9 /* CCLock.h in Headers */, B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, + 50ABBE2D1925AB6F00A911A9 /* ccCArray.h in Headers */, 50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */, + 50ABBD5E1925AB0000A911A9 /* Vec3.h in Headers */, 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, + 50ABBE211925AB6F00A911A9 /* atitc.h in Headers */, 1A8C5999180E930E00EF57C3 /* CCActionNode.h in Headers */, 1A8C599D180E930E00EF57C3 /* CCActionObject.h in Headers */, + B29594B61926D5EC003EEF37 /* CCMeshCommand.h in Headers */, + 50ABBE371925AB6F00A911A9 /* CCConsole.h in Headers */, 1A8C59A1180E930E00EF57C3 /* CCArmature.h in Headers */, 1A8C59A5180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, 1A8C59A9180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, + 50ABC00B1926664800A911A9 /* CCDevice.h in Headers */, 2905FA7A18CF08D100240AA3 /* UISlider.h in Headers */, - 500DC93E19106300007B91BF /* CCConsole.h in Headers */, 1A8C59AD180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, + 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */, 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, + 50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */, 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */, 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */, + 50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.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 */, 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */, - 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 */, + 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */, + 50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */, + 50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */, + 50ABBE971925AB6F00A911A9 /* CCProtocols.h in Headers */, 1A8C59D1180E930E00EF57C3 /* CCDatas.h in Headers */, 1A8C59D5180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, 1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, + 50ABC0691926664800A911A9 /* CCStdC.h in Headers */, + 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */, + 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, 1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */, 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */, 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */, 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, + 50ABC0171926664800A911A9 /* CCImage.h in Headers */, 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */, - 5034CA1D191D591100CE6051 /* CCGLProgramCache.h in Headers */, + 50ABBDA91925AB4100A911A9 /* CCRenderCommand.h in Headers */, + 50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */, 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */, 1A8C59F9180E930E00EF57C3 /* CCTransformHelp.h in Headers */, 1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */, 1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */, + 50ABC0091926664800A911A9 /* CCCommon.h in Headers */, + 50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, 1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */, - 500DC93619106300007B91BF /* ccConfig.h in Headers */, - 500DC93019106300007B91BF /* base64.h in Headers */, 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */, 50FCEBBD18C72017004AD434 /* TextBMFontReader.h in Headers */, - 500DC95619106300007B91BF /* CCEventCustom.h in Headers */, 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5420,211 +5343,197 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 500DC9B31910633C007B91BF /* CCTouch.h in Headers */, 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */, 2AC795E81862875D005EC8E1 /* Event.h in Headers */, - 500DC97B19106300007B91BF /* CCEventMouse.h in Headers */, 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 */, + 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, + 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */, + 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, - 500DC95719106300007B91BF /* CCEventCustom.h in Headers */, - 500DC95319106300007B91BF /* CCEventAcceleration.h in Headers */, - B2AF2F9818EBAEAE00C5807C /* MathUtil.h in Headers */, - 500DC9BF19106E89007B91BF /* CCProfiling.h in Headers */, - 500DC8D819105F7D007B91BF /* CCGeometry.h in Headers */, 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */, - 46A1703F1807CC07005B8026 /* CCDirectorCaller.h in Headers */, - 46A170381807CBFE005B8026 /* CCSAXParser.h in Headers */, + 50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */, 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, - 500DC97319106300007B91BF /* CCEventListenerMouse.h in Headers */, - 500DC99319106300007B91BF /* CCRefPtr.h in Headers */, - 46A1702E1807CBFE005B8026 /* CCDevice.h in Headers */, - 46A1702A1807CBFE005B8026 /* CCLock.h in Headers */, - 46A170451807CC07005B8026 /* CCESRenderer.h in Headers */, + 50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */, + B29594D11926D61F003EEF37 /* CCSprite3DDataCache.h in Headers */, 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */, - 46A170411807CC07005B8026 /* CCGLView.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 */, - 46A1703A1807CBFE005B8026 /* CCThread.h in Headers */, 46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */, 2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */, - 500DC8BD19105D41007B91BF /* CCQuadCommand.h in Headers */, + B29594C51926D61F003EEF37 /* CCMesh.h in Headers */, + 50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */, + 50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */, 46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */, - 46A170491807CC07005B8026 /* CCStdC.h in Headers */, - 46A1703B1807CC07005B8026 /* CCApplication.h in Headers */, - 46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */, - 46A170431807CC07005B8026 /* CCES2Renderer.h in Headers */, - 46A170331807CBFE005B8026 /* CCImage.h in Headers */, + 50ABBDB41925AB4100A911A9 /* ccShaders.h in Headers */, + 50ABBE861925AB6F00A911A9 /* ccFPSImages.h in Headers */, + 50ABBE2E1925AB6F00A911A9 /* ccCArray.h in Headers */, + 50ABC0041926664800A911A9 /* CCLock.h in Headers */, 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, + 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */, 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */, - 46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */, - 46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */, - 46A1702C1807CBFE005B8026 /* CCApplicationProtocol.h in Headers */, + 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */, + 50ABBE401925AB6F00A911A9 /* CCDataVisitor.h in Headers */, 1A570064180BC5A10088DEC7 /* CCAction.h in Headers */, 06CAAACE186AD7FA0012A414 /* TriggerBase.h in Headers */, - 500DC9AD19106300007B91BF /* ZipUtils.h in Headers */, + 503DD8EC1926736A00CD74DD /* CCGLView.h in Headers */, 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */, + 50ABBEBA1925AB6F00A911A9 /* ccUTF8.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, + 50ABBEC41925AB6F00A911A9 /* CCVector.h in Headers */, + 50ABBE501925AB6F00A911A9 /* CCEventCustom.h 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 */, + 50ABBD631925AB0000A911A9 /* Vec4.h in Headers */, 1A01C68918F57BE800EFE3A6 /* CCBool.h in Headers */, 1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */, + 50ABBE781925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, B37510861823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, 1A570080180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A570084180BC5A10088DEC7 /* CCActionManager.h in Headers */, + 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */, 1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, + 50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */, 1A57008C180BC5A10088DEC7 /* CCActionProgressTimer.h in Headers */, 2905FA8318CF08D100240AA3 /* UITextAtlas.h in Headers */, 1A570090180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */, 1A570094180BC5A10088DEC7 /* CCActionTween.h in Headers */, - 1A0DB7331823827C0025743D /* CCEAGLView.h in Headers */, 1A57009B180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, 2905FA5118CF08D100240AA3 /* UIHelper.h in Headers */, 1A5700A1180BC5D20088DEC7 /* CCNode.h in Headers */, - 500DC93B19106300007B91BF /* CCConfiguration.h in Headers */, 50FCEB9618C72017004AD434 /* ButtonReader.h in Headers */, 2905FA7118CF08D100240AA3 /* UIRichText.h in Headers */, + 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */, + 50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */, 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */, 2905FA7318CF08D100240AA3 /* UIScrollInterface.h in Headers */, + 50ABBE881925AB6F00A911A9 /* ccMacros.h in Headers */, + 50ABC0101926664800A911A9 /* CCFileUtils.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 */, 1A570111180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, 50E6D33F18E174130051CA34 /* UIVBox.h in Headers */, + 50ABBE381925AB6F00A911A9 /* CCConsole.h in Headers */, + 50ABBE8A1925AB6F00A911A9 /* CCMap.h in Headers */, + 503DD8E61926736A00CD74DD /* CCEAGLView.h in Headers */, + 50ABBE4C1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, + 50ABBD571925AB0000A911A9 /* TransformUtils.h in Headers */, 1A570115180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, 06CAAAC5186AD7E50012A414 /* TriggerObj.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 */, + 50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */, + 50ABBD411925AB0000A911A9 /* CCMath.h in Headers */, 1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */, + 50ABBD9A1925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */, + 50ABBD3F1925AB0000A911A9 /* CCGeometry.h in Headers */, + 50ABBFFE1926664800A911A9 /* CCFileUtilsApple.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, - 500DC98919106300007B91BF /* CCNS.h in Headers */, 1A5701B4180BCB590088DEC7 /* CCFontFNT.h in Headers */, 1A5701B8180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, 1A5701BC180BCB5A0088DEC7 /* CCLabel.h in Headers */, 1A5701C0180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */, + 50ABBE681925AB6F00A911A9 /* CCEventListenerCustom.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 */, + 50ABBDA61925AB4100A911A9 /* CCQuadCommand.h in Headers */, + 50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */, 1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */, 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, + 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */, + 50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 1A5701CE180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, - 296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */, 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */, 1A5701E1180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E5180BCB8C0088DEC7 /* CCScene.h in Headers */, - 500DC92D19106300007B91BF /* atitc.h in Headers */, 1A5701E9180BCB8C0088DEC7 /* CCTransition.h in Headers */, + 50ABBED41925AB6F00A911A9 /* uthash.h in Headers */, 1A5701ED180BCB8C0088DEC7 /* CCTransitionPageTurn.h in Headers */, - 500DC8C119105D41007B91BF /* CCRenderCommand.h in Headers */, 1A5701F1180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */, 1A5701FA180BCBAD0088DEC7 /* CCMenu.h in Headers */, 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */, 1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, + 50ABC00C1926664800A911A9 /* CCDevice.h in Headers */, 1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, - 2928C2031923756F00E77353 /* UILayoutExecutant.h in Headers */, + 50ABBEA21925AB6F00A911A9 /* CCScheduler.h 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 */, - 500DC95B19106300007B91BF /* CCEventDispatcher.h in Headers */, + 503DD8F61926B0DB00CD74DD /* CCIMEDelegate.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 */, + 50ABBE981925AB6F00A911A9 /* CCProtocols.h in Headers */, 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */, - 500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */, - 500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */, 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */, - 500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */, + 50ABBD431925AB0000A911A9 /* CCMathBase.h in Headers */, + 50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */, 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */, - 500DC99119106300007B91BF /* CCRef.h in Headers */, 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570285180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, 1A570289180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, + 50ABBE701925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */, 1A57028D180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */, 1A570295180BCCAB0088DEC7 /* CCAnimation.h in Headers */, + 50ABBDB81925AB4100A911A9 /* CCTexture2D.h in Headers */, + 50ABBE341925AB6F00A911A9 /* CCConfiguration.h in Headers */, 1A570299180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, - 1A5702B2180BCDBC0088DEC7 /* ccUTF8.h in Headers */, - 1A5702B8180BCDF40088DEC7 /* CCVertex.h in Headers */, 06CAAAD2186AD8030012A414 /* ObjectFactory.h in Headers */, - 1A5702BB180BCDFC0088DEC7 /* ccUtils.h in Headers */, - 1A5702C1180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */, + 50ABBEAA1925AB6F00A911A9 /* CCTouch.h in Headers */, 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */, + 50ABBE741925AB6F00A911A9 /* CCEventListenerMouse.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 */, 2905FA7F18CF08D100240AA3 /* UIText.h in Headers */, - 1A5702D6180BCE570088DEC7 /* CCTexture2D.h in Headers */, - 1A5702DA180BCE570088DEC7 /* CCTextureAtlas.h in Headers */, - 1A5702DE180BCE570088DEC7 /* CCTextureCache.h in Headers */, 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 */, + 50ABBE2A1925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 1A57030F180BCF190088DEC7 /* CCComponent.h in Headers */, 1A570313180BCF190088DEC7 /* CCComponentContainer.h in Headers */, 1A087AEB1860400400196EF5 /* edtaa3func.h in Headers */, - 1A57031C180BCF430088DEC7 /* ccCArray.h in Headers */, 2905FA6518CF08D100240AA3 /* UIListView.h in Headers */, 50FCEBAA18C72017004AD434 /* LoadingBarReader.h in Headers */, - B2AF2FA818EBAEAE00C5807C /* Vector3.h in Headers */, - 1A57031E180BCF430088DEC7 /* uthash.h in Headers */, - 500DC98B19106300007B91BF /* CCPlatformConfig.h in Headers */, - 1A570320180BCF430088DEC7 /* utlist.h in Headers */, 50FCEBC618C72017004AD434 /* TextReader.h in Headers */, 2905FA7718CF08D100240AA3 /* UIScrollView.h in Headers */, B375107F1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, - 1A570327180BCF660088DEC7 /* TGAlib.h in Headers */, - 1A570332180BCFD50088DEC7 /* CCUserDefault.h in Headers */, - 500DC94319106300007B91BF /* CCData.h in Headers */, 1A57034E180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570357180BD0B00088DEC7 /* ioapi.h in Headers */, + 50ABBD4B1925AB0000A911A9 /* Mat4.h in Headers */, 1A01C69B18F57BE800EFE3A6 /* CCSet.h in Headers */, + 50ABBED61925AB6F00A911A9 /* utlist.h in Headers */, 1A57035B180BD0B00088DEC7 /* unzip.h in Headers */, 5034CA48191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, + 50ABBD531925AB0000A911A9 /* Quaternion.h in Headers */, 1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */, + 503DD8E81926736A00CD74DD /* CCES2Renderer.h in Headers */, 1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */, + 50ABBE6C1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, 1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */, 5034CA3E191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, + 50ABBE301925AB6F00A911A9 /* ccConfig.h in Headers */, + 50ABBDAC1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */, 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */, 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */, @@ -5635,42 +5544,57 @@ 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, 5034CA3C191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, + 50ABC0181926664800A911A9 /* CCImage.h in Headers */, + 50ABBE8E1925AB6F00A911A9 /* CCNS.h in Headers */, + 50ABBEA61925AB6F00A911A9 /* CCScriptSupport.h in Headers */, 46C02E0A18E91123004B7456 /* xxhash.h in Headers */, 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, 50E6D33B18E174130051CA34 /* UIRelativeBox.h in Headers */, + 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */, + 50ABBE3C1925AB6F00A911A9 /* CCData.h in Headers */, 1AD71DD8180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, + 503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, 1AD71DDC180E26E600808F54 /* CCLayerColorLoader.h in Headers */, 1AD71DE0180E26E600808F54 /* CCLayerGradientLoader.h in Headers */, 1AD71DE4180E26E600808F54 /* CCLayerLoader.h in Headers */, + 50ABBEC81925AB6F00A911A9 /* etc1.h in Headers */, 1AD71DE8180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */, 50E6D31118DAF01E0051CA34 /* CCProtectedNode.h in Headers */, 1AD71DEC180E26E600808F54 /* CCMenuItemLoader.h in Headers */, 1AD71DEE180E26E600808F54 /* CCMenuLoader.h in Headers */, 1AD71DF2180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, + 50ABBDB01925AB4100A911A9 /* CCRenderer.h in Headers */, + B29594B71926D5EC003EEF37 /* CCMeshCommand.h in Headers */, 1AD71DF6180E26E600808F54 /* CCNodeLoader.h in Headers */, + 50ABBD861925AB4100A911A9 /* CCBatchCommand.h in Headers */, 1AD71DFA180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, - B2AF2FAC18EBAEAE00C5807C /* Vector4.h in Headers */, + 50ABBE481925AB6F00A911A9 /* CCEvent.h in Headers */, 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */, + B29594CD1926D61F003EEF37 /* CCSprite3D.h in Headers */, 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */, + 50ABBE641925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */, 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */, 1AD71E0C180E26E600808F54 /* CCSpriteLoader.h in Headers */, + 50ABBD921925AB4100A911A9 /* CCGLProgramCache.h in Headers */, 1AD71E0E180E26E600808F54 /* CocosBuilder.h in Headers */, - 500DC93719106300007B91BF /* ccConfig.h in Headers */, + B29594C91926D61F003EEF37 /* CCObjLoader.h in Headers */, 1AD71E98180E26E600808F54 /* Animation.h in Headers */, 1AD71E9C180E26E600808F54 /* AnimationState.h in Headers */, + 50ABBE961925AB6F00A911A9 /* CCProfiling.h in Headers */, + 503DD8E01926736A00CD74DD /* CCApplication.h in Headers */, + 50ABBD8E1925AB4100A911A9 /* CCGLProgram.h in Headers */, 1AD71EA0180E26E600808F54 /* AnimationStateData.h in Headers */, 50FCEB9E18C72017004AD434 /* ImageViewReader.h in Headers */, - 500DC98119106300007B91BF /* CCEventType.h in Headers */, + 50ABC0081926664800A911A9 /* CCApplicationProtocol.h in Headers */, 1AD71EA4180E26E600808F54 /* Atlas.h in Headers */, 1AD71EA8180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */, 1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */, + 50ABBD4F1925AB0000A911A9 /* MathUtil.h in Headers */, 1AD71EAC180E26E600808F54 /* Attachment.h in Headers */, - 500DC94719106300007B91BF /* CCDataVisitor.h in Headers */, 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 */, @@ -5679,95 +5603,99 @@ 1AD71EBC180E26E600808F54 /* CCSkeleton.h in Headers */, 1A01C69718F57BE800EFE3A6 /* CCInteger.h in Headers */, 50FCEBB218C72017004AD434 /* ScrollViewReader.h in Headers */, + 50ABBEBE1925AB6F00A911A9 /* ccUtils.h in Headers */, + 50ABBE801925AB6F00A911A9 /* CCEventTouch.h in Headers */, 1AD71EC0180E26E600808F54 /* CCSkeletonAnimation.h in Headers */, - 500DC94F19106300007B91BF /* CCEvent.h in Headers */, - B2AF2FB218EBBDA100C5807C /* CCMath.h in Headers */, 1AD71EC4180E26E600808F54 /* extension.h in Headers */, 1AD71EC8180E26E600808F54 /* Json.h in Headers */, 1AD71ECC180E26E600808F54 /* RegionAttachment.h in Headers */, + 50ABBDBC1925AB4100A911A9 /* CCTextureAtlas.h in Headers */, 1AD71ED0180E26E600808F54 /* Skeleton.h in Headers */, + 50ABBE541925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, 1AD71ED4180E26E600808F54 /* SkeletonData.h in Headers */, 1AD71ED8180E26E600808F54 /* SkeletonJson.h in Headers */, 1A12775A18DFCC4F0005F345 /* CCTweenFunction.h in Headers */, 1AD71EDC180E26E600808F54 /* Skin.h in Headers */, + 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, 1AD71EE0180E26E600808F54 /* Slot.h in Headers */, 1AD71EE4180E26E600808F54 /* SlotData.h in Headers */, 1AD71EE8180E26E600808F54 /* spine-cocos2dx.h in Headers */, - B2AF2F9C18EBAEAE00C5807C /* Matrix.h in Headers */, 1AD71EEA180E26E600808F54 /* spine.h in Headers */, 1AAF536D180E3374000584C8 /* HttpClient.h in Headers */, 1AAF536F180E3374000584C8 /* HttpRequest.h in Headers */, 1AAF5371180E3374000584C8 /* HttpResponse.h in Headers */, 1AAF5375180E3374000584C8 /* SocketIO.h in Headers */, 1AAF5379180E3374000584C8 /* WebSocket.h in Headers */, + 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, + 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, - 1A9DCA26180E6955007A3AD4 /* ccFPSImages.h in Headers */, - 5034CA5A191D591100CE6051 /* CCGLProgram.h in Headers */, + 50ABBD471925AB0000A911A9 /* CCVertex.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 */, 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 */, 1A8C599A180E930E00EF57C3 /* CCActionNode.h in Headers */, 1A8C599E180E930E00EF57C3 /* CCActionObject.h in Headers */, 1A8C59A2180E930E00EF57C3 /* CCArmature.h in Headers */, 1A8C59A6180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, 2905FA8718CF08D100240AA3 /* UITextBMFont.h in Headers */, - 500DC97F19106300007B91BF /* CCEventTouch.h in Headers */, - B2AF2FA418EBAEAE00C5807C /* Vector2.h in Headers */, 1A8C59AA180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, 1A8C59AE180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, 1A8C59B2180E930E00EF57C3 /* CCBatchNode.h in Headers */, 1A8C59B6180E930E00EF57C3 /* CCBone.h in Headers */, - 500DC9A919106300007B91BF /* s3tc.h in Headers */, 1A8C59BA180E930E00EF57C3 /* CCColliderDetector.h in Headers */, + 50ABBEAE1925AB6F00A911A9 /* ccTypes.h in Headers */, 1A8C59BE180E930E00EF57C3 /* CCComAttribute.h in Headers */, + 50ABBE261925AB6F00A911A9 /* base64.h in Headers */, 1A8C59C2180E930E00EF57C3 /* CCComAudio.h in Headers */, 1A01C68718F57BE800EFE3A6 /* CCArray.h in Headers */, 1A01C6A718F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, - 500DC98D19106300007B91BF /* CCPlatformMacros.h in Headers */, 1A8C59C6180E930E00EF57C3 /* CCComController.h in Headers */, + 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */, 1A8C59CA180E930E00EF57C3 /* CCComRender.h in Headers */, 1A8C59CE180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, 1A8C59D2180E930E00EF57C3 /* CCDatas.h in Headers */, + 50ABBDC01925AB4100A911A9 /* CCTextureCache.h in Headers */, ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */, 1A8C59D6180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, + 50ABC0201926664800A911A9 /* CCThread.h in Headers */, 1A01C69318F57BE800EFE3A6 /* CCDouble.h in Headers */, + 50ABBE221925AB6F00A911A9 /* atitc.h in Headers */, 1A8C59DA180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, 1A8C59DE180E930E00EF57C3 /* CCDisplayManager.h in Headers */, 50FCEBB618C72017004AD434 /* SliderReader.h in Headers */, - 500DC99719106300007B91BF /* CCScheduler.h in Headers */, - 500DC98319106300007B91BF /* ccMacros.h in Headers */, + 50ABBED21925AB6F00A911A9 /* TGAlib.h in Headers */, 1A01C68D18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, 1A8C59E2180E930E00EF57C3 /* CCInputDelegate.h in Headers */, + 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */, 1A8C59E6180E930E00EF57C3 /* CCProcessBase.h in Headers */, - 500DC96319106300007B91BF /* CCEventListener.h in Headers */, + 29CB8F4F1929D1BB00C841D6 /* UILayoutExecutant.h in Headers */, + 50ABBE581925AB6F00A911A9 /* CCEventFocus.h in Headers */, + 50ABC00A1926664800A911A9 /* CCCommon.h in Headers */, 2905FA5918CF08D100240AA3 /* UILayout.h in Headers */, + 50ABBE5C1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, B375107D1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, + 50ABC01C1926664800A911A9 /* CCSAXParser.h in Headers */, 2905FA4518CF08D100240AA3 /* GUIDefine.h in Headers */, 1A8C59EA180E930E00EF57C3 /* CCSGUIReader.h in Headers */, + 503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */, 1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */, B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, - 500DC94B19106300007B91BF /* CCDirector.h in Headers */, 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */, 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */, 1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */, + 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */, 1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */, 1A8C5A06180E930E00EF57C3 /* CCUtilMath.h in Headers */, + 50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */, 1A8C5A08180E930E00EF57C3 /* CocoStudio.h in Headers */, 1A8C5A10180E930E00EF57C3 /* DictionaryHelper.h in Headers */, + 50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6124,70 +6052,64 @@ buildActionMask = 2147483647; files = ( 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */, + 50ABBE2B1925AB6F00A911A9 /* ccCArray.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 */, 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */, - 46A170501807CC1C005B8026 /* CCApplication.mm in Sources */, + 50ABBD581925AB0000A911A9 /* Vec2.cpp in Sources */, + 50ABBE311925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A01C6A418F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, 46A170EA1807CECA005B8026 /* CCPhysicsJoint.cpp in Sources */, - 46A170141807CBFC005B8026 /* CCFileUtilsApple.mm in Sources */, - 500DC99C19106300007B91BF /* CCValue.cpp in Sources */, 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */, - 500DC95C19106300007B91BF /* CCEventKeyboard.cpp in Sources */, - 46A1701D1807CBFC005B8026 /* CCFileUtils.cpp in Sources */, + 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */, + 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */, 46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */, - 500DC96C19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */, - 46A170231807CBFC005B8026 /* CCSAXParser.cpp in Sources */, - B2AF2FA918EBAEAE00C5807C /* Vector4.cpp in Sources */, 46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */, - 46A170171807CBFC005B8026 /* CCThread.mm in Sources */, + 50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */, ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */, 06CAAACB186AD7F20012A414 /* TriggerMng.cpp in Sources */, - 46A170511807CC1C005B8026 /* CCCommon.mm in Sources */, - 46A1701B1807CBFC005B8026 /* CCGLViewProtocol.cpp in Sources */, - 500DC97019106300007B91BF /* CCEventListenerMouse.cpp in Sources */, 46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */, - 3E26D40818ACB63900834404 /* CCDevice.mm in Sources */, - 46A170151807CBFC005B8026 /* CCLock.cpp in Sources */, - A04583F2189053B500E32FE8 /* CCGLView.cpp in Sources */, + 50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, + 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */, + 50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */, + 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */, + 50ABBE271925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, + 50ABBE8B1925AB6F00A911A9 /* CCNS.cpp in Sources */, 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */, - 46A170251807CBFC005B8026 /* CCThread.cpp in Sources */, 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, - 5034CA4F191D591100CE6051 /* ccGLStateCache.cpp in Sources */, + 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */, 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, - 500DC8BE19105D41007B91BF /* CCRenderCommand.cpp in Sources */, + 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A570069180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006D180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, 2905FA4E18CF08D100240AA3 /* UIHelper.cpp in Sources */, 1A570071180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, B37510761823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, - 500DC98619106300007B91BF /* CCNS.cpp in Sources */, + 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */, 1A570075180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, B375107A1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.cpp in Sources */, 1A570079180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */, - B2AF2FA118EBAEAE00C5807C /* Vector2.cpp in Sources */, - 500DC95819106300007B91BF /* CCEventDispatcher.cpp in Sources */, + 50ABBE591925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */, 1A57007D180BC5A10088DEC7 /* CCActionInterval.cpp in Sources */, 1A570081180BC5A10088DEC7 /* CCActionManager.cpp in Sources */, 1A570085180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */, 1A570089180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */, - 296CAD281915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */, 1A57008D180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570091180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, - B2AF2F9918EBAEAE00C5807C /* Matrix.cpp in Sources */, - 500DC94419106300007B91BF /* CCDataVisitor.cpp in Sources */, + 50ABBEBF1925AB6F00A911A9 /* CCValue.cpp in Sources */, 1A570098180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */, 2905FA7418CF08D100240AA3 /* UIScrollView.cpp in Sources */, + 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, B37510781823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, - 500DC97819106300007B91BF /* CCEventMouse.cpp in Sources */, 50FCEBB718C72017004AD434 /* TextAtlasReader.cpp in Sources */, + 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */, 1A57010E180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */, + 50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */, 2905FA6618CF08D100240AA3 /* UILoadingBar.cpp in Sources */, 50FCEBA318C72017004AD434 /* ListViewReader.cpp in Sources */, 1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */, @@ -6196,35 +6118,29 @@ 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 */, 1A5701BD180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */, + 50ABBE551925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, + 50ABBE491925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */, 1A5701C1180BCB5A0088DEC7 /* CCLabelBMFont.cpp in Sources */, + 50ABBD4C1925AB0000A911A9 /* MathUtil.cpp in Sources */, 1A087AE81860400400196EF5 /* edtaa3func.cpp in Sources */, B37510731823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */, + 50ABBD831925AB4100A911A9 /* CCBatchCommand.cpp in Sources */, 1A5701C7180BCB5A0088DEC7 /* CCLabelTextFormatter.cpp in Sources */, 1A5701CB180BCB5A0088DEC7 /* CCLabelTTF.cpp in Sources */, + 50ABBE711925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */, 1A5701DE180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, - 500DC99819106300007B91BF /* ccTypes.cpp in Sources */, - 500DC8C419105D41007B91BF /* CCRenderer.cpp in Sources */, 1A5701E2180BCB8C0088DEC7 /* CCScene.cpp in Sources */, 1A12775C18DFCC590005F345 /* CCTweenFunction.cpp in Sources */, - 500DC94019106300007B91BF /* CCData.cpp in Sources */, 1A5701E6180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, 1A5701EA180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, - 500DC9B619106E6D007B91BF /* TransformUtils.cpp in Sources */, + 50ABBDAD1925AB4100A911A9 /* CCRenderer.cpp in Sources */, 1A5701EE180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */, 1A5701F7180BCBAD0088DEC7 /* CCMenu.cpp in Sources */, 1A1645B2191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, @@ -6233,185 +6149,202 @@ 06CAAACF186AD7FC0012A414 /* TriggerBase.cpp in Sources */, 1A570208180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */, 1A570210180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, + 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 1A570214180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, + 50ABBE411925AB6F00A911A9 /* CCDirector.cpp in Sources */, 1A570221180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, 1A570225180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, 1A570229180BCC1A0088DEC7 /* CCParticleSystem.cpp in Sources */, 1A57022D180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, - 500DC9B01910633C007B91BF /* CCTouch.cpp in Sources */, 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */, - 500DC9AA19106300007B91BF /* ZipUtils.cpp in Sources */, - 1A570234180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */, 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, + 50ABC0191926664800A911A9 /* CCSAXParser.cpp in Sources */, 1A57028A180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */, - 3E26D40518ACB5D100834404 /* CCImage.cpp in Sources */, 1A570292180BCCAB0088DEC7 /* CCAnimation.cpp in Sources */, 1A570296180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, 2905FA8C18CF08D100240AA3 /* UIWidget.cpp in Sources */, 2905FA8018CF08D100240AA3 /* UITextAtlas.cpp in Sources */, + 50ABBE351925AB6F00A911A9 /* CCConsole.cpp in Sources */, + 50ABBEAF1925AB6F00A911A9 /* CCUserDefault.cpp in Sources */, 50FCEBBB18C72017004AD434 /* TextBMFontReader.cpp in Sources */, + 50ABBE791925AB6F00A911A9 /* CCEventMouse.cpp in Sources */, 50FCEBBF18C72017004AD434 /* TextFieldReader.cpp in Sources */, 50FCEBAF18C72017004AD434 /* ScrollViewReader.cpp in Sources */, - 1A5702AF180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */, - 500DC8D519105F7D007B91BF /* CCGeometry.cpp in Sources */, - 1A5702B5180BCDF40088DEC7 /* CCVertex.cpp in Sources */, - 1A5702C2180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */, + 50ABC0111926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, + B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */, + 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, + 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */, - 1A5702D3180BCE570088DEC7 /* CCTexture2D.cpp in Sources */, - 1A5702D7180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */, - 1A5702DB180BCE570088DEC7 /* CCTextureCache.cpp in Sources */, 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, + 50ABBD971925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, 1A5702EE180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */, - 500DC97C19106300007B91BF /* CCEventTouch.cpp in Sources */, + 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, 1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, 1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, 1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, + 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */, 1A570300180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */, - 1A570305180BCED90088DEC7 /* ccUtils.cpp in Sources */, 1A57030C180BCF190088DEC7 /* CCComponent.cpp in Sources */, - 500DC96019106300007B91BF /* CCEventListener.cpp in Sources */, 1A570310180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */, - 1A570319180BCF430088DEC7 /* ccCArray.cpp in Sources */, B37510711823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */, - 1A570324180BCF660088DEC7 /* TGAlib.cpp in Sources */, 1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */, - 1A57032F180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */, - 1A570333180BCFD50088DEC7 /* CCUserDefault.mm in Sources */, - 1A570335180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */, + 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */, + 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */, 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */, - 500DC93C19106300007B91BF /* CCConsole.cpp in Sources */, + 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, - 500DC95419106300007B91BF /* CCEventCustom.cpp in Sources */, 1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */, 50E6D33418E174130051CA34 /* UIHBox.cpp in Sources */, + 50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */, 2905FA8418CF08D100240AA3 /* UITextBMFont.cpp in Sources */, 1AD71DB1180E26E600808F54 /* CCBKeyframe.cpp in Sources */, 1AD71DB7180E26E600808F54 /* CCBReader.cpp in Sources */, - B2AF2FA518EBAEAE00C5807C /* Vector3.cpp in Sources */, + 50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, 1AD71DBD180E26E600808F54 /* CCBSequence.cpp in Sources */, 1AD71DC1180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */, 1AD71DC9180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */, 1AD71DCD180E26E600808F54 /* CCControlLoader.cpp in Sources */, + 50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */, 50FCEBC718C72017004AD434 /* WidgetReader.cpp in Sources */, 1AD71DD1180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */, 1AD71DD5180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */, + 50ABBEA71925AB6F00A911A9 /* CCTouch.cpp in Sources */, 1AD71DD9180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */, - 500DC94C19106300007B91BF /* CCEvent.cpp in Sources */, - 500DC8BA19105D41007B91BF /* CCQuadCommand.cpp in Sources */, 1AD71DDD180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */, 1AD71DE1180E26E600808F54 /* CCLayerLoader.cpp in Sources */, 1AD71DE5180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */, + 50ABBD8B1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, 1AD71DE9180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */, + 50ABBDA31925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, 2905FA6A18CF08D100240AA3 /* UIPageView.cpp in Sources */, + B29594C61926D61F003EEF37 /* CCObjLoader.cpp in Sources */, 06CAAAC7186AD7E90012A414 /* TriggerObj.cpp in Sources */, 1AD71DEF180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, + 50ABC01D1926664800A911A9 /* CCThread.cpp in Sources */, 1AD71DF3180E26E600808F54 /* CCNodeLoader.cpp in Sources */, 1AD71DF7180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, + 50ABBECB1925AB6F00A911A9 /* s3tc.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 */, - 500DC8AE19105D41007B91BF /* CCCustomCommand.cpp in Sources */, - 500DC92A19106300007B91BF /* atitc.cpp in Sources */, + 50ABBD481925AB0000A911A9 /* Mat4.cpp in Sources */, 1AD71E95180E26E600808F54 /* Animation.cpp in Sources */, 1AD71E99180E26E600808F54 /* AnimationState.cpp in Sources */, 1AD71E9D180E26E600808F54 /* AnimationStateData.cpp in Sources */, 1AD71EA1180E26E600808F54 /* Atlas.cpp in Sources */, - 500DC97419106300007B91BF /* CCEventListenerTouch.cpp in Sources */, 1AD71EA5180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */, - 500DC8D119105F7D007B91BF /* CCAffineTransform.cpp in Sources */, + 50ABBD8F1925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, + 50ABBD441925AB0000A911A9 /* CCVertex.cpp in Sources */, 1AD71EA9180E26E600808F54 /* Attachment.cpp in Sources */, 1AD71EAD180E26E600808F54 /* AttachmentLoader.cpp in Sources */, + 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, 1AD71EB1180E26E600808F54 /* Bone.cpp in Sources */, 1AD71EB5180E26E600808F54 /* BoneData.cpp in Sources */, 1AD71EB9180E26E600808F54 /* CCSkeleton.cpp in Sources */, - 500DC8AA19105D41007B91BF /* CCBatchCommand.cpp in Sources */, + 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, 1AD71EBD180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */, 2905FA4018CF08D100240AA3 /* CocosGUI.cpp in Sources */, 1AD71EC1180E26E600808F54 /* extension.cpp in Sources */, + 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, + 29CB8F4C1929D1BB00C841D6 /* UILayoutExecutant.cpp in Sources */, + 50ABC0051926664800A911A9 /* CCThread.mm in Sources */, 1AD71EC5180E26E600808F54 /* Json.cpp in Sources */, - B2AF2F9518EBAEAE00C5807C /* MathUtil.cpp in Sources */, 50E6D33C18E174130051CA34 /* UIVBox.cpp in Sources */, 1AD71EC9180E26E600808F54 /* RegionAttachment.cpp in Sources */, 50E6D33818E174130051CA34 /* UIRelativeBox.cpp in Sources */, 1AD71ECD180E26E600808F54 /* Skeleton.cpp in Sources */, 1AD71ED1180E26E600808F54 /* SkeletonData.cpp in Sources */, 1AD71ED5180E26E600808F54 /* SkeletonJson.cpp in Sources */, - 296CAD221915EC8000C64FBF /* CCEventFocus.cpp in Sources */, + B29594CA1926D61F003EEF37 /* CCSprite3D.cpp in Sources */, 1AD71ED9180E26E600808F54 /* Skin.cpp in Sources */, 1AD71EDD180E26E600808F54 /* Slot.cpp in Sources */, 1AD71EE1180E26E600808F54 /* SlotData.cpp in Sources */, 2905FA7818CF08D100240AA3 /* UISlider.cpp in Sources */, 1AD71EE5180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, 1AAF536A180E3374000584C8 /* HttpClient.cpp in Sources */, + 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */, 1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */, + 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */, 1AAF5376180E3374000584C8 /* WebSocket.cpp in Sources */, - 2928C2001923756F00E77353 /* UILayoutExecutant.cpp in Sources */, 1A01C69818F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1AAF584F180E40B9000584C8 /* LocalStorage.cpp in Sources */, + 50ABBEA31925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */, + 50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, 1AAF5853180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 2905FA4A18CF08D100240AA3 /* UICheckBox.cpp in Sources */, - 500DC94819106300007B91BF /* CCDirector.cpp in Sources */, - 500DC9BC19106E89007B91BF /* CCProfiling.cpp in Sources */, - 1A9DCA23180E6955007A3AD4 /* ccFPSImages.c in Sources */, 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, - 500DC9A219106300007B91BF /* etc1.cpp in Sources */, 2905FA5E18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */, + 50ABBD541925AB0000A911A9 /* TransformUtils.cpp in Sources */, 1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */, + 50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, 1A8C598F180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */, + 50ABBDB91925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */, 1A8C5993180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */, - B2AF2F9D18EBAEAE00C5807C /* Quaternion.cpp in Sources */, 1A8C5997180E930E00EF57C3 /* CCActionNode.cpp in Sources */, + 50ABBECF1925AB6F00A911A9 /* TGAlib.cpp in Sources */, 50FCEBC318C72017004AD434 /* TextReader.cpp in Sources */, 1A8C599B180E930E00EF57C3 /* CCActionObject.cpp in Sources */, + 50ABBE451925AB6F00A911A9 /* CCEvent.cpp in Sources */, 1A8C599F180E930E00EF57C3 /* CCArmature.cpp in Sources */, 1A8C59A3180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */, 1A8C59A7180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */, 1A8C59AB180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */, 1A8C59AF180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, + 50ABBE611925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, + 50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */, 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, - 5034CA5B191D591100CE6051 /* CCGLProgram.cpp in Sources */, 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, + 50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */, 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */, 2905FA5218CF08D100240AA3 /* UIImageView.cpp in Sources */, + 50ABBDBD1925AB4100A911A9 /* CCTextureCache.cpp in Sources */, + B29594CE1926D61F003EEF37 /* CCSprite3DDataCache.cpp in Sources */, 2905FA7C18CF08D100240AA3 /* UIText.cpp in Sources */, 50FCEB9F18C72017004AD434 /* LayoutReader.cpp in Sources */, + 50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */, 1A8C59C7180E930E00EF57C3 /* CCComRender.cpp in Sources */, + 50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */, 1A8C59CB180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */, 1A8C59CF180E930E00EF57C3 /* CCDatas.cpp in Sources */, 1A8C59D3180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */, - 500DC8B219105D41007B91BF /* CCGroupCommand.cpp in Sources */, 50FCEBB318C72017004AD434 /* SliderReader.cpp in Sources */, + 50ABBE4D1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */, + 50ABBE9F1925AB6F00A911A9 /* CCScheduler.cpp in Sources */, + 50ABC0151926664800A911A9 /* CCImage.cpp in Sources */, + 50ABBE231925AB6F00A911A9 /* base64.cpp in Sources */, + 50ABBE5D1925AB6F00A911A9 /* CCEventListener.cpp in Sources */, 1A8C59D7180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */, + 50ABBD601925AB0000A911A9 /* Vec4.cpp in Sources */, 1A8C59DB180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */, 2905FA6218CF08D100240AA3 /* UIListView.cpp in Sources */, 1A8C59DF180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */, - 500DC92E19106300007B91BF /* base64.cpp in Sources */, - 500DC99419106300007B91BF /* CCScheduler.cpp in Sources */, 1A8C59E3180E930E00EF57C3 /* CCProcessBase.cpp in Sources */, - 500DC98E19106300007B91BF /* CCRef.cpp in Sources */, 1A8C59E7180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */, + 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */, 1A8C59EB180E930E00EF57C3 /* CCSkin.cpp in Sources */, 1A8C59EF180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, 1A8C59F3180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */, 2905FA6E18CF08D100240AA3 /* UIRichText.cpp in Sources */, + B29594B41926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */, 1A01C68E18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, 1A8C59F7180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */, + 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, 1A8C59FB180E930E00EF57C3 /* CCTween.cpp in Sources */, 2905FA8818CF08D100240AA3 /* UITextField.cpp in Sources */, 46C02E0718E91123004B7456 /* xxhash.c in Sources */, 1A8C5A03180E930E00EF57C3 /* CCUtilMath.cpp in Sources */, 1A8C5A0D180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, + 50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */, 1ABA68AE1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */, 2905FA4618CF08D100240AA3 /* UIButton.cpp in Sources */, ); @@ -6554,295 +6487,298 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 296CAD291915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */, 1A01C69918F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1A01C69D18F57BE800EFE3A6 /* CCString.cpp in Sources */, - 2928C2011923756F00E77353 /* UILayoutExecutant.cpp in Sources */, 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */, 2AC795E318628746005EC8E1 /* SkeletonBounds.cpp in Sources */, 2AC795E418628746005EC8E1 /* Event.cpp in Sources */, 2AC795E518628746005EC8E1 /* EventData.cpp in Sources */, 2AC795E618628746005EC8E1 /* BoundingBoxAttachment.cpp in Sources */, - 46A1703C1807CC07005B8026 /* CCApplication.mm in Sources */, - 500DC93919106300007B91BF /* CCConfiguration.cpp in Sources */, - 500DC92F19106300007B91BF /* base64.cpp in Sources */, - 46A170471807CC07005B8026 /* CCImage.mm in Sources */, - 46A1704B1807CC07005B8026 /* CCEAGLView.mm in Sources */, 46A171001807CECB005B8026 /* CCPhysicsJoint.cpp in Sources */, - 46A170441807CC07005B8026 /* CCES2Renderer.m in Sources */, - 46A170281807CBFE005B8026 /* CCFileUtilsApple.mm in Sources */, - 46A170311807CBFE005B8026 /* CCFileUtils.cpp in Sources */, - 500DC9B719106E6D007B91BF /* TransformUtils.cpp in Sources */, 46A171051807CECB005B8026 /* CCPhysicsWorld.cpp in Sources */, - 46A1703E1807CC07005B8026 /* CCDevice.mm in Sources */, - 500DC9A319106300007B91BF /* etc1.cpp in Sources */, + 50ABBDA01925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, 46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */, + 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */, 1A01C6A518F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, - 46A170371807CBFE005B8026 /* CCSAXParser.cpp in Sources */, - 46A1702B1807CBFE005B8026 /* CCThread.mm in Sources */, 50E6D33918E174130051CA34 /* UIRelativeBox.cpp in Sources */, ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */, - 46A170401807CC07005B8026 /* CCDirectorCaller.mm in Sources */, 1A01C68F18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, + 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, 06CAAACC186AD7F50012A414 /* TriggerMng.cpp in Sources */, - 46A1703D1807CC07005B8026 /* CCCommon.mm in Sources */, + 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */, + 50ABC01A1926664800A911A9 /* CCSAXParser.cpp in Sources */, + 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */, 50FCEBC818C72017004AD434 /* WidgetReader.cpp in Sources */, - 46A1702F1807CBFE005B8026 /* CCGLViewProtocol.cpp in Sources */, 46A170FC1807CECB005B8026 /* CCPhysicsBody.cpp in Sources */, - 46A170291807CBFE005B8026 /* CCLock.cpp in Sources */, - 500DC97119106300007B91BF /* CCEventListenerMouse.cpp in Sources */, - 500DC8AB19105D41007B91BF /* CCBatchCommand.cpp in Sources */, - 500DC92B19106300007B91BF /* atitc.cpp in Sources */, + 50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, + 50ABBE281925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */, - 46A170391807CBFE005B8026 /* CCThread.cpp in Sources */, 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */, - 46A170421807CC07005B8026 /* CCGLView.mm in Sources */, 1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */, 1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 1A57006A180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006E180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, + 50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, 1A570072180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, + 50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 2905FA8D18CF08D100240AA3 /* UIWidget.cpp in Sources */, + B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */, + 50ABBE7E1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, 50FCEB9818C72017004AD434 /* CheckBoxReader.cpp in Sources */, + 50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, + 50ABBE461925AB6F00A911A9 /* CCEvent.cpp in Sources */, + 50ABBEA01925AB6F00A911A9 /* CCScheduler.cpp in Sources */, + 50ABBE4E1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */, + 50ABBE761925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, + 50ABBE5A1925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */, 1A570076180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, - 500DC99D19106300007B91BF /* CCValue.cpp in Sources */, B37510851823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.cpp in Sources */, + 50ABBD551925AB0000A911A9 /* TransformUtils.cpp in Sources */, 1A57007A180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */, + 50ABBEC01925AB6F00A911A9 /* CCValue.cpp in Sources */, + 50ABBD591925AB0000A911A9 /* Vec2.cpp in Sources */, + 50ABBE421925AB6F00A911A9 /* CCDirector.cpp in Sources */, 1A57007E180BC5A10088DEC7 /* CCActionInterval.cpp in Sources */, 1A570082180BC5A10088DEC7 /* CCActionManager.cpp in Sources */, - 500DC97519106300007B91BF /* CCEventListenerTouch.cpp in Sources */, 1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */, - 500DC9BD19106E89007B91BF /* CCProfiling.cpp in Sources */, 1A57008A180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */, + B29594CB1926D61F003EEF37 /* CCSprite3D.cpp in Sources */, 2905FA6F18CF08D100240AA3 /* UIRichText.cpp in Sources */, + 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */, 1A57008E180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570092180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, 1A570099180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, + 50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */, + 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A57009F180BC5D20088DEC7 /* CCNode.cpp in Sources */, B37510831823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, - B2AF2FA618EBAEAE00C5807C /* Vector3.cpp in Sources */, + B29594CF1926D61F003EEF37 /* CCSprite3DDataCache.cpp in Sources */, 1A57010F180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */, 1A570113180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */, 1A57011C180BC90D0088DEC7 /* CCGrabber.cpp in Sources */, 1A570120180BC90D0088DEC7 /* CCGrid.cpp in Sources */, - 500DC96919106300007B91BF /* CCEventListenerCustom.cpp in Sources */, 06C0F2F0186AD824003594D5 /* ObjectFactory.cpp in Sources */, - 500DC99919106300007B91BF /* ccTypes.cpp in Sources */, 1A57019E180BCB590088DEC7 /* CCFont.cpp in Sources */, + 503DD8E21926736A00CD74DD /* CCCommon.mm in Sources */, 1A5701A2180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, + 50ABC00E1926664800A911A9 /* CCFileUtils.cpp in Sources */, + 50ABBE241925AB6F00A911A9 /* base64.cpp in Sources */, 1A5701A6180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */, - 500DC96119106300007B91BF /* CCEventListener.cpp in Sources */, 1A5701B2180BCB590088DEC7 /* CCFontFNT.cpp in Sources */, 1A5701B6180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */, + 50ABBEAC1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A5701BA180BCB5A0088DEC7 /* CCLabel.cpp in Sources */, 2905FA4B18CF08D100240AA3 /* UICheckBox.cpp in Sources */, 1A5701BE180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */, 1A5701C2180BCB5A0088DEC7 /* CCLabelBMFont.cpp in Sources */, - 500DC97919106300007B91BF /* CCEventMouse.cpp in Sources */, 1A087AE91860400400196EF5 /* edtaa3func.cpp in Sources */, B375107E1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */, - 500DC99519106300007B91BF /* CCScheduler.cpp in Sources */, 1A5701C8180BCB5A0088DEC7 /* CCLabelTextFormatter.cpp in Sources */, 1A5701CC180BCB5A0088DEC7 /* CCLabelTTF.cpp in Sources */, 1A5701DF180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, + 50ABBDBE1925AB4100A911A9 /* CCTextureCache.cpp in Sources */, 1A5701E3180BCB8C0088DEC7 /* CCScene.cpp in Sources */, - 500DC95119106300007B91BF /* CCEventAcceleration.cpp in Sources */, - 5034CA5C191D591100CE6051 /* CCGLProgram.cpp in Sources */, - 500DC9B11910633C007B91BF /* CCTouch.cpp in Sources */, + 50ABBD611925AB0000A911A9 /* Vec4.cpp in Sources */, + 50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, 1A5701E7180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, + 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */, 1A5701EB180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, 1A5701EF180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */, 1A5701F8180BCBAD0088DEC7 /* CCMenu.cpp in Sources */, + 50ABBD511925AB0000A911A9 /* Quaternion.cpp in Sources */, 1A5701FC180BCBAD0088DEC7 /* CCMenuItem.cpp in Sources */, 06CAAAD0186AD7FE0012A414 /* TriggerBase.cpp in Sources */, 2905FA4F18CF08D100240AA3 /* UIHelper.cpp in Sources */, + 50ABBD491925AB0000A911A9 /* Mat4.cpp in Sources */, 1A570203180BCBD40088DEC7 /* CCClippingNode.cpp in Sources */, 1A570209180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */, 1A570211180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, + 503DD8ED1926736A00CD74DD /* CCGLView.mm in Sources */, 50FCEBA818C72017004AD434 /* LoadingBarReader.cpp in Sources */, 1A570215180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, 1A570222180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, - 500DC9AB19106300007B91BF /* ZipUtils.cpp in Sources */, 1A570226180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, 1A57022A180BCC1A0088DEC7 /* CCParticleSystem.cpp in Sources */, 1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, - 1A570235180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */, + 50ABBD901925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */, 2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */, 50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */, 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */, - 500DC93319106300007B91BF /* CCAutoreleasePool.cpp in Sources */, 1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570287180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, 1A57028B180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */, 1A570293180BCCAB0088DEC7 /* CCAnimation.cpp in Sources */, 1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, 50FCEBC418C72017004AD434 /* TextReader.cpp in Sources */, - 500DC94919106300007B91BF /* CCDirector.cpp in Sources */, - 1A5702B0180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */, 50FCEB9418C72017004AD434 /* ButtonReader.cpp in Sources */, - 500DC8AF19105D41007B91BF /* CCCustomCommand.cpp in Sources */, - 1A5702B6180BCDF40088DEC7 /* CCVertex.cpp in Sources */, - 1A5702C3180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */, + 50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A5702C9180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, - 1A5702D4180BCE570088DEC7 /* CCTexture2D.cpp in Sources */, - 1A5702D8180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */, - 1A5702DC180BCE570088DEC7 /* CCTextureCache.cpp in Sources */, 1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, 1A5702EF180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */, 1A5702F3180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, + 50ABBD3D1925AB0000A911A9 /* CCGeometry.cpp in Sources */, + 50ABBECC1925AB6F00A911A9 /* s3tc.cpp in Sources */, 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */, 1A5702F7180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, + 50ABBEC61925AB6F00A911A9 /* etc1.cpp in Sources */, + 50ABBE8C1925AB6F00A911A9 /* CCNS.cpp in Sources */, + 50ABBDAE1925AB4100A911A9 /* CCRenderer.cpp in Sources */, + 50ABBDBA1925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */, 1A5702FB180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, - 500DC8B319105D41007B91BF /* CCGroupCommand.cpp in Sources */, 2905FA6B18CF08D100240AA3 /* UIPageView.cpp in Sources */, - 500DC95519106300007B91BF /* CCEventCustom.cpp in Sources */, 1A570301180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */, - 1A570306180BCED90088DEC7 /* ccUtils.cpp in Sources */, 1A57030D180BCF190088DEC7 /* CCComponent.cpp in Sources */, 1A570311180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */, - 296CAD231915EC8000C64FBF /* CCEventFocus.cpp in Sources */, - 1A57031A180BCF430088DEC7 /* ccCArray.cpp in Sources */, + 50ABBE2C1925AB6F00A911A9 /* ccCArray.cpp in Sources */, + 50ABC0061926664800A911A9 /* CCThread.mm in Sources */, B375107C1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */, 50FCEBB418C72017004AD434 /* SliderReader.cpp in Sources */, - 1A570325180BCF660088DEC7 /* TGAlib.cpp in Sources */, - 1A570330180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */, - 1A570334180BCFD50088DEC7 /* CCUserDefault.mm in Sources */, - 1A570336180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */, - 500DC95919106300007B91BF /* CCEventDispatcher.cpp in Sources */, + 50ABBEB61925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, + 50ABBDB61925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 1A570355180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570359180BD0B00088DEC7 /* unzip.cpp in Sources */, - 500DC96519106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */, - 500DC94D19106300007B91BF /* CCEvent.cpp in Sources */, 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, + 50ABBD881925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, + 50ABBE941925AB6F00A911A9 /* CCProfiling.cpp in Sources */, 1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */, 1AD71DB2180E26E600808F54 /* CCBKeyframe.cpp in Sources */, 1AD71DB8180E26E600808F54 /* CCBReader.cpp in Sources */, - 500DC8C519105D41007B91BF /* CCRenderer.cpp in Sources */, 1AD71DBE180E26E600808F54 /* CCBSequence.cpp in Sources */, 1AD71DC2180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */, 1AD71DCA180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */, - 500DC9A719106300007B91BF /* s3tc.cpp in Sources */, 1AD71DCE180E26E600808F54 /* CCControlLoader.cpp in Sources */, 1AD71DD2180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */, - B2AF2F9618EBAEAE00C5807C /* MathUtil.cpp in Sources */, - B2AF2F9A18EBAEAE00C5807C /* Matrix.cpp in Sources */, + 50ABBE5E1925AB6F00A911A9 /* CCEventListener.cpp in Sources */, 1AD71DD6180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */, 1AD71DDA180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */, 50FCEBC018C72017004AD434 /* TextFieldReader.cpp in Sources */, 1AD71DDE180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */, + B29594C31926D61F003EEF37 /* CCMesh.cpp in Sources */, 1AD71DE2180E26E600808F54 /* CCLayerLoader.cpp in Sources */, 1AD71DE6180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */, + 50ABBEA81925AB6F00A911A9 /* CCTouch.cpp in Sources */, 1AD71DEA180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */, 06CAAAC8186AD7EB0012A414 /* TriggerObj.cpp in Sources */, 1AD71DF0180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, + 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */, 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */, - 5034CA50191D591100CE6051 /* ccGLStateCache.cpp in Sources */, + 50ABBE6A1925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, + 50ABBE661925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, 1AD71DF4180E26E600808F54 /* CCNodeLoader.cpp in Sources */, + 503DD8F81926B0DB00CD74DD /* CCIMEDispatcher.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 */, 1AD71E96180E26E600808F54 /* Animation.cpp in Sources */, 1AD71E9A180E26E600808F54 /* AnimationState.cpp in Sources */, 1AD71E9E180E26E600808F54 /* AnimationStateData.cpp in Sources */, + 50ABBDB21925AB4100A911A9 /* ccShaders.cpp in Sources */, 1AD71EA2180E26E600808F54 /* Atlas.cpp in Sources */, 1AD71EA6180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */, 1AD71EAA180E26E600808F54 /* Attachment.cpp in Sources */, 1AD71EAE180E26E600808F54 /* AttachmentLoader.cpp in Sources */, 1AD71EB2180E26E600808F54 /* Bone.cpp in Sources */, + 50ABBD451925AB0000A911A9 /* CCVertex.cpp in Sources */, 2905FA8118CF08D100240AA3 /* UITextAtlas.cpp in Sources */, + B29594C71926D61F003EEF37 /* CCObjLoader.cpp in Sources */, + 50ABBEB01925AB6F00A911A9 /* CCUserDefault.cpp in Sources */, 50FCEBB818C72017004AD434 /* TextAtlasReader.cpp in Sources */, 1AD71EB6180E26E600808F54 /* BoneData.cpp in Sources */, - 500DC8D619105F7D007B91BF /* CCGeometry.cpp in Sources */, 50FCEB9C18C72017004AD434 /* ImageViewReader.cpp in Sources */, + 50ABBE521925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, 1AD71EBA180E26E600808F54 /* CCSkeleton.cpp in Sources */, 1A01C68B18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, 1AD71EBE180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */, - 500DC94119106300007B91BF /* CCData.cpp in Sources */, 50FCEBBC18C72017004AD434 /* TextBMFontReader.cpp in Sources */, - 500DC8BB19105D41007B91BF /* CCQuadCommand.cpp in Sources */, + 50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, + 50ABBD841925AB4100A911A9 /* CCBatchCommand.cpp in Sources */, 1AD71EC2180E26E600808F54 /* extension.cpp in Sources */, 1AD71EC6180E26E600808F54 /* Json.cpp in Sources */, 1AD71ECA180E26E600808F54 /* RegionAttachment.cpp in Sources */, 1AD71ECE180E26E600808F54 /* Skeleton.cpp in Sources */, 1AD71ED2180E26E600808F54 /* SkeletonData.cpp in Sources */, - 500DC97D19106300007B91BF /* CCEventTouch.cpp in Sources */, 1AD71ED6180E26E600808F54 /* SkeletonJson.cpp in Sources */, + 50ABBDA81925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, 2905FA6718CF08D100240AA3 /* UILoadingBar.cpp in Sources */, 2905FA5F18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */, 1AD71EDA180E26E600808F54 /* Skin.cpp in Sources */, + 50ABBEA41925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */, 1AD71EDE180E26E600808F54 /* Slot.cpp in Sources */, 1AD71EE2180E26E600808F54 /* SlotData.cpp in Sources */, + 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */, 1AD71EE6180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, 2905FA8518CF08D100240AA3 /* UITextBMFont.cpp in Sources */, 1AAF536B180E3374000584C8 /* HttpClient.cpp in Sources */, - 3E26D40618ACB5D100834404 /* CCImage.cpp in Sources */, 1AAF5373180E3374000584C8 /* SocketIO.cpp in Sources */, - 500DC94519106300007B91BF /* CCDataVisitor.cpp in Sources */, - B2AF2FAA18EBAEAE00C5807C /* Vector4.cpp in Sources */, 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */, - 500DC93D19106300007B91BF /* CCConsole.cpp in Sources */, + 50ABBDA41925AB4100A911A9 /* CCQuadCommand.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 */, + 50ABBE201925AB6F00A911A9 /* atitc.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 */, + 50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */, + 50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */, + 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */, + 50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */, + 50ABC0121926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, + 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */, 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */, 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */, 1A8C5990180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */, + 29CB8F4D1929D1BB00C841D6 /* UILayoutExecutant.cpp in Sources */, 50FCEBA418C72017004AD434 /* ListViewReader.cpp in Sources */, 1A8C5994180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */, + 50ABBEBC1925AB6F00A911A9 /* ccUtils.cpp in Sources */, + 50ABBE721925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */, 1A8C5998180E930E00EF57C3 /* CCActionNode.cpp in Sources */, 1A8C599C180E930E00EF57C3 /* CCActionObject.cpp in Sources */, 2905FA6318CF08D100240AA3 /* UIListView.cpp in Sources */, 1A8C59A0180E930E00EF57C3 /* CCArmature.cpp in Sources */, + 50ABC0001926664800A911A9 /* CCFileUtilsApple.mm in Sources */, 2905FA7918CF08D100240AA3 /* UISlider.cpp in Sources */, 1A8C59A4180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */, 1A8C59A8180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */, 2905FA8918CF08D100240AA3 /* UITextField.cpp in Sources */, 1A8C59AC180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */, - 500DC98719106300007B91BF /* CCNS.cpp in Sources */, + 50ABBEB81925AB6F00A911A9 /* ccUTF8.cpp in Sources */, 1A8C59B0180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, + 50ABBE841925AB6F00A911A9 /* ccFPSImages.c in Sources */, 1A8C59B4180E930E00EF57C3 /* CCBone.cpp in Sources */, 1A8C59B8180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, 1A8C59BC180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, - 500DC8BF19105D41007B91BF /* CCRenderCommand.cpp in Sources */, + 50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */, 1A8C59C0180E930E00EF57C3 /* CCComAudio.cpp in Sources */, - B2AF2F9E18EBAEAE00C5807C /* Quaternion.cpp in Sources */, 1A8C59C4180E930E00EF57C3 /* CCComController.cpp in Sources */, 1A8C59C8180E930E00EF57C3 /* CCComRender.cpp in Sources */, 1A8C59CC180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */, 1A8C59D0180E930E00EF57C3 /* CCDatas.cpp in Sources */, 1A8C59D4180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */, - 500DC96D19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */, 1A8C59D8180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */, 46C02E0818E91123004B7456 /* xxhash.c in Sources */, - 500DC95D19106300007B91BF /* CCEventKeyboard.cpp in Sources */, + 50ABBED01925AB6F00A911A9 /* TGAlib.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 */, 1A8C59E4180E930E00EF57C3 /* CCProcessBase.cpp in Sources */, + 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */, 1A8C59E8180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */, 1A8C59EC180E930E00EF57C3 /* CCSkin.cpp in Sources */, 2905FA4718CF08D100240AA3 /* UIButton.cpp in Sources */, 1A8C59F0180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, + 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm 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 */, + 50ABBE3A1925AB6F00A911A9 /* CCData.cpp in Sources */, 1A8C59FC180E930E00EF57C3 /* CCTween.cpp in Sources */, 2905FA5318CF08D100240AA3 /* UIImageView.cpp in Sources */, 1A1645B3191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, @@ -6850,6 +6786,8 @@ 2905FA7518CF08D100240AA3 /* UIScrollView.cpp in Sources */, 1A8C5A0E180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, 1ABA68AF1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */, + 50ABBE7A1925AB6F00A911A9 /* CCEventMouse.cpp in Sources */, + 50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7129,7 +7067,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -7146,7 +7084,7 @@ "\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"", "\"$(SRCROOT)/../external/websockets/prebuilt/mac\"", ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop"; }; name = Debug; }; @@ -7155,7 +7093,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_KEYBOARD_SUPPORT, @@ -7172,7 +7110,7 @@ "\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"", "\"$(SRCROOT)/../external/websockets/prebuilt/mac\"", ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop"; }; name = Release; }; @@ -7235,7 +7173,6 @@ "$(inherited)", "/Applications/Xcode\\ 2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", ); - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath/ $(SRCROOT)/../cocos/2d/platform $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../cocos/ui $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/Box2D $(SRCROOT)/../external $(SRCROOT)/../cocos/storage"; }; name = Debug; }; @@ -7246,7 +7183,6 @@ "$(inherited)", "/Applications/Xcode\\ 2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", ); - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath/ $(SRCROOT)/../cocos/2d/platform $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../cocos/ui $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/Box2D $(SRCROOT)/../external $(SRCROOT)/../cocos/storage"; }; name = Release; }; @@ -7256,7 +7192,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; HEADER_SEARCH_PATHS = ""; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac"; }; name = Debug; }; @@ -7266,7 +7202,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; HEADER_SEARCH_PATHS = ""; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac"; }; name = Release; }; @@ -7281,7 +7217,7 @@ ); HEADER_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "$(inherited)"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -7296,7 +7232,7 @@ ); HEADER_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "$(inherited)"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; }; name = Release; }; @@ -7306,7 +7242,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7334,7 +7270,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; }; name = Debug; }; @@ -7344,7 +7280,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7372,7 +7308,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; }; name = Release; }; @@ -7410,7 +7346,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -7428,7 +7364,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; }; name = Release; }; @@ -7505,7 +7441,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios"; }; name = Debug; }; @@ -7522,7 +7458,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios"; }; name = Release; }; diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index c13c8fd7bd..4ed7d5dbc9 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -812,6 +812,10 @@ 29080DE4191B595E0066F8DF /* UIWidgetAddNodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D89191B595E0066F8DF /* UIWidgetAddNodeTest.cpp */; }; 29080DE5191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; 29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; + 3E92EA821921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; }; + 3E92EA831921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; }; + 3E92EA851921A7720094CD21 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; + 3E92EA861921A7720094CD21 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; }; 3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */; }; @@ -827,6 +831,8 @@ A07A52BF1783AF210073F6A7 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B91783AE900073F6A7 /* OpenGLES.framework */; }; A07A52C01783AF250073F6A7 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B71783AE6D0073F6A7 /* UIKit.framework */; }; A07A52C31783B02C0073F6A7 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; }; + B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; + B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; C08689C118D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; }; C08689C218D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; }; C08689C318D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; }; @@ -1849,6 +1855,9 @@ 29080D8A191B595E0066F8DF /* UIWidgetAddNodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest.h; sourceTree = ""; }; 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidgetAddNodeTest_Editor.cpp; sourceTree = ""; }; 29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = ""; }; + 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sprite3DTest.cpp; path = Sprite3DTest/Sprite3DTest.cpp; sourceTree = ""; }; + 3E92EA811921A1400094CD21 /* Sprite3DTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sprite3DTest.h; path = Sprite3DTest/Sprite3DTest.h; sourceTree = ""; }; + 3E92EA841921A7720094CD21 /* Sprite3DTest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Sprite3DTest; path = "../tests/cpp-tests/Resources/Sprite3DTest"; sourceTree = ""; }; 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = cocosvideo.mp4; path = "../tests/cpp-tests/Resources/cocosvideo.mp4"; sourceTree = ""; }; 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; }; 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoPlayerTest.cpp; sourceTree = ""; }; @@ -1864,6 +1873,7 @@ A07A52B91783AE900073F6A7 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; }; A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; A07A52C11783B01F0073F6A7 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; }; + B2507B6A192589AF00FA4972 /* Shaders3D */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Shaders3D; path = "../tests/cpp-tests/Resources/Shaders3D"; sourceTree = ""; }; C08689C018D370C90093E810 /* background.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = background.caf; path = "../tests/cpp-tests/Resources/background.caf"; sourceTree = ""; }; D60AE43317F7FFE100757E4B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; }; EDCC747E17C455FD007B692C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; @@ -2258,6 +2268,7 @@ 1AC35AE918CECF0C00F37B72 /* SchedulerTest */, 1AC35AEC18CECF0C00F37B72 /* ShaderTest */, 1AC35AF118CECF0C00F37B72 /* SpineTest */, + 3E92EA7D1921A0C60094CD21 /* Sprite3DTest */, 1AC35AF418CECF0C00F37B72 /* SpriteTest */, 1AC35AF718CECF0C00F37B72 /* testBasic.cpp */, 1AC35AF818CECF0C00F37B72 /* testBasic.h */, @@ -3274,6 +3285,8 @@ 1AC35CA818CED83500F37B72 /* Resources */ = { isa = PBXGroup; children = ( + B2507B6A192589AF00FA4972 /* Shaders3D */, + 3E92EA841921A7720094CD21 /* Sprite3DTest */, 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */, 1AC35CA918CED84500F37B72 /* animations */, 1AC35CAE18CED84500F37B72 /* ccb */, @@ -3790,6 +3803,15 @@ name = Frameworks; sourceTree = ""; }; + 3E92EA7D1921A0C60094CD21 /* Sprite3DTest */ = { + isa = PBXGroup; + children = ( + 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */, + 3E92EA811921A1400094CD21 /* Sprite3DTest.h */, + ); + name = Sprite3DTest; + sourceTree = ""; + }; 3EA0FB6F191C844400B170C8 /* UIVideoPlayerTest */ = { isa = PBXGroup; children = ( @@ -4415,6 +4437,7 @@ 1AC35D0418CED84500F37B72 /* Shaders in Resources */, 1AC35CD818CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, 1AC35CDC18CED84500F37B72 /* commonly_used_words.txt in Resources */, + B2507B6B192589AF00FA4972 /* Shaders3D in Resources */, 1AC35D0618CED84500F37B72 /* spine in Resources */, 1AC35CE818CED84500F37B72 /* extensions in Resources */, 1AC35CDE18CED84500F37B72 /* components in Resources */, @@ -4433,6 +4456,7 @@ 1AC35D0018CED84500F37B72 /* pew-pew-lei.wav in Resources */, 1AC35CD018CED84500F37B72 /* background.mp3 in Resources */, 1AC35CD618CED84500F37B72 /* CocosBuilderExample.ccbproj in Resources */, + 3E92EA851921A7720094CD21 /* Sprite3DTest in Resources */, 1AC35CA318CECF1E00F37B72 /* InfoPlist.strings in Resources */, 1AC35CA418CECF1E00F37B72 /* MainMenu.xib in Resources */, 1AC35CD418CED84500F37B72 /* ccb in Resources */, @@ -4471,6 +4495,7 @@ 1AC35CD318CED84500F37B72 /* background.ogg in Resources */, 1AC35CCB18CED84500F37B72 /* animations in Resources */, 3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */, + 3E92EA861921A7720094CD21 /* Sprite3DTest in Resources */, 1AC35C8C18CECF1400F37B72 /* Icon-114.png in Resources */, 1AC35CF118CED84500F37B72 /* hd in Resources */, 1AC35C9318CECF1400F37B72 /* Icon-57.png in Resources */, @@ -4486,6 +4511,7 @@ 1AC35C9418CECF1400F37B72 /* Icon-58.png in Resources */, 1AC35CD118CED84500F37B72 /* background.mp3 in Resources */, 1AC35CD918CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, + B2507B6C192589AF00FA4972 /* Shaders3D in Resources */, 1AC35CED18CED84500F37B72 /* fonts in Resources */, 1AC35CD718CED84500F37B72 /* CocosBuilderExample.ccbproj in Resources */, 1AC35CDD18CED84500F37B72 /* commonly_used_words.txt in Resources */, @@ -4574,6 +4600,7 @@ 1AC35BE118CECF0C00F37B72 /* CCControlButtonTest.cpp in Sources */, 1AC35BEB18CECF0C00F37B72 /* CCControlSliderTest.cpp in Sources */, 1AC35C4D18CECF0C00F37B72 /* SpineTest.cpp in Sources */, + 3E92EA821921A1400094CD21 /* Sprite3DTest.cpp in Sources */, 1AC35C1D18CECF0C00F37B72 /* NewRendererTest.cpp in Sources */, 1AC35B6718CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */, 29080DB7191B595E0066F8DF /* UIListViewTest_Editor.cpp in Sources */, @@ -4906,6 +4933,7 @@ 1AC35B5418CECF0C00F37B72 /* CocosDenshionTest.cpp in Sources */, 1AC35B8018CECF0C00F37B72 /* ProjectileController.cpp in Sources */, 1AC35C2618CECF0C00F37B72 /* PerformanceAllocTest.cpp in Sources */, + 3E92EA831921A1400094CD21 /* Sprite3DTest.cpp in Sources */, 1AC35B5A18CECF0C00F37B72 /* controller.cpp in Sources */, 1AC35C2A18CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp in Sources */, 1AC35BEA18CECF0C00F37B72 /* CCControlSceneManager.cpp in Sources */, @@ -5228,7 +5256,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -5242,7 +5270,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5262,7 +5290,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5281,7 +5309,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5298,7 +5326,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -5314,7 +5342,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5331,7 +5359,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5347,7 +5375,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5367,7 +5395,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5386,7 +5414,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5405,7 +5433,7 @@ PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5423,7 +5451,7 @@ PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5437,7 +5465,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -5450,7 +5478,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5497,7 +5525,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -5513,7 +5541,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/cocos/2d/CCActionGrid.cpp b/cocos/2d/CCActionGrid.cpp index 437cbd6178..6f3aec7b8b 100644 --- a/cocos/2d/CCActionGrid.cpp +++ b/cocos/2d/CCActionGrid.cpp @@ -23,10 +23,12 @@ 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/CCActionGrid.h" -#include "base/CCDirector.h" + #include "2d/CCGrid.h" #include "2d/CCNodeGrid.h" +#include "base/CCDirector.h" NS_CC_BEGIN // implementation of GridAction diff --git a/cocos/2d/CCActionInstant.cpp b/cocos/2d/CCActionInstant.cpp index 6a2a5e4a0b..1b5372520a 100644 --- a/cocos/2d/CCActionInstant.cpp +++ b/cocos/2d/CCActionInstant.cpp @@ -28,7 +28,7 @@ #include "2d/CCActionInstant.h" #include "2d/CCNode.h" #include "2d/CCSprite.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" diff --git a/cocos/2d/CCActionInterval.h b/cocos/2d/CCActionInterval.h index 564c24c4d5..d1b3a9dd46 100644 --- a/cocos/2d/CCActionInterval.h +++ b/cocos/2d/CCActionInterval.h @@ -28,13 +28,14 @@ THE SOFTWARE. #ifndef __ACTION_CCINTERVAL_ACTION_H__ #define __ACTION_CCINTERVAL_ACTION_H__ +#include + #include "2d/CCNode.h" #include "2d/CCAction.h" -#include "2d/CCProtocols.h" #include "2d/CCSpriteFrame.h" #include "2d/CCAnimation.h" +#include "base/CCProtocols.h" #include "base/CCVector.h" -#include NS_CC_BEGIN diff --git a/cocos/2d/CCActionManager.cpp b/cocos/2d/CCActionManager.cpp index 98be24d3ee..0fb432a912 100644 --- a/cocos/2d/CCActionManager.cpp +++ b/cocos/2d/CCActionManager.cpp @@ -30,8 +30,8 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "base/CCScheduler.h" #include "base/ccMacros.h" -#include "2d/ccCArray.h" -#include "2d/uthash.h" +#include "base/ccCArray.h" +#include "base/uthash.h" NS_CC_BEGIN // diff --git a/cocos/2d/CCAnimation.cpp b/cocos/2d/CCAnimation.cpp index d95b0816f6..335288b675 100644 --- a/cocos/2d/CCAnimation.cpp +++ b/cocos/2d/CCAnimation.cpp @@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "2d/CCAnimation.h" -#include "2d/CCTextureCache.h" -#include "2d/CCTexture2D.h" -#include "base/ccMacros.h" #include "2d/CCSpriteFrame.h" +#include "renderer/CCTextureCache.h" +#include "renderer/CCTexture2D.h" +#include "base/ccMacros.h" #include "base/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCAnimationCache.cpp b/cocos/2d/CCAnimationCache.cpp index e1e922d8ae..fcbe96d501 100644 --- a/cocos/2d/CCAnimationCache.cpp +++ b/cocos/2d/CCAnimationCache.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "2d/CCAnimation.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "deprecated/CCString.h" using namespace std; diff --git a/cocos/2d/CCAtlasNode.cpp b/cocos/2d/CCAtlasNode.cpp index 8c1ac25ebf..cc750ff187 100644 --- a/cocos/2d/CCAtlasNode.cpp +++ b/cocos/2d/CCAtlasNode.cpp @@ -26,10 +26,10 @@ THE SOFTWARE. ****************************************************************************/ #include "CCAtlasNode.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" #include "base/CCDirector.h" #include "base/CCDirector.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCRenderer.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" diff --git a/cocos/2d/CCAtlasNode.h b/cocos/2d/CCAtlasNode.h index cdcda77bc6..9fa995488d 100644 --- a/cocos/2d/CCAtlasNode.h +++ b/cocos/2d/CCAtlasNode.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCATLAS_NODE_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "base/ccTypes.h" #include "renderer/CCQuadCommand.h" diff --git a/cocos/2d/CCComponent.cpp b/cocos/2d/CCComponent.cpp index 1c71ce4a70..22ae3e915c 100644 --- a/cocos/2d/CCComponent.cpp +++ b/cocos/2d/CCComponent.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "2d/CCComponent.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" NS_CC_BEGIN diff --git a/cocos/2d/CCComponent.h b/cocos/2d/CCComponent.h index fac789b3b0..c52db45b3c 100644 --- a/cocos/2d/CCComponent.h +++ b/cocos/2d/CCComponent.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CC_FRAMEWORK_COMPONENT_H__ #include "base/CCRef.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCFont.cpp b/cocos/2d/CCFont.cpp index 8e18fc4a66..1561df741f 100644 --- a/cocos/2d/CCFont.cpp +++ b/cocos/2d/CCFont.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCFont.h" -#include "ccUTF8.h" +#include "2d/CCFont.h" +#include "base/ccUTF8.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlas.cpp b/cocos/2d/CCFontAtlas.cpp index fd3425c4fa..18153676af 100644 --- a/cocos/2d/CCFontAtlas.cpp +++ b/cocos/2d/CCFontAtlas.cpp @@ -25,7 +25,7 @@ #include "2d/CCFontAtlas.h" #include "2d/CCFontFreeType.h" -#include "ccUTF8.h" +#include "base/ccUTF8.h" #include "base/CCDirector.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/2d/CCFontCharMap.cpp b/cocos/2d/CCFontCharMap.cpp index 75e802e31e..4438f7a165 100644 --- a/cocos/2d/CCFontCharMap.cpp +++ b/cocos/2d/CCFontCharMap.cpp @@ -25,10 +25,10 @@ #include "CCFontCharMap.h" #include "2d/CCFontAtlas.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" +#include "base/ccUTF8.h" #include "base/CCDirector.h" -#include "2d/CCTextureCache.h" -#include "ccUTF8.h" +#include "renderer/CCTextureCache.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontFNT.cpp b/cocos/2d/CCFontFNT.cpp index 6e7a9f7364..adae2b9ac3 100644 --- a/cocos/2d/CCFontFNT.cpp +++ b/cocos/2d/CCFontFNT.cpp @@ -24,15 +24,16 @@ ****************************************************************************/ #include "2d/CCFontFNT.h" -#include "2d/uthash.h" +#include "base/uthash.h" +#include "2d/CCFontAtlas.h" +#include "base/ccUTF8.h" +#include "platform/CCFileUtils.h" #include "base/CCConfiguration.h" #include "base/CCDirector.h" -#include "2d/CCFontAtlas.h" #include "base/CCMap.h" +#include "renderer/CCTextureCache.h" + #include "deprecated/CCString.h" -#include "2d/CCTextureCache.h" -#include "ccUTF8.h" -#include "2d/platform/CCFileUtils.h" using namespace std; NS_CC_BEGIN diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index 588bb4b4ac..c99269bcdd 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -23,12 +23,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "2d/CCFontFreeType.h" + #include #include -#include "ccUTF8.h" -#include "2d/CCFontFreeType.h" -#include "2d/platform/CCFileUtils.h" +#include "base/ccUTF8.h" +#include "platform/CCFileUtils.h" #include "edtaa3func.h" #include FT_BBOX_H @@ -563,4 +564,4 @@ void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned } } -NS_CC_END \ No newline at end of file +NS_CC_END diff --git a/cocos/2d/CCGrabber.cpp b/cocos/2d/CCGrabber.cpp index f6a633c411..6a4f68acd9 100644 --- a/cocos/2d/CCGrabber.cpp +++ b/cocos/2d/CCGrabber.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. ****************************************************************************/ #include "CCGrabber.h" #include "base/ccMacros.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" NS_CC_BEGIN diff --git a/cocos/2d/CCGrid.cpp b/cocos/2d/CCGrid.cpp index dc7b879de9..1e43ad7d5b 100644 --- a/cocos/2d/CCGrid.cpp +++ b/cocos/2d/CCGrid.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "base/CCDirector.h" #include "2d/CCGrabber.h" -#include "2d/ccUtils.h" +#include "base/ccUtils.h" #include "2d/CCGrid.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramCache.h" diff --git a/cocos/2d/CCGrid.h b/cocos/2d/CCGrid.h index 9d59f24ce7..4e0c96f68d 100644 --- a/cocos/2d/CCGrid.h +++ b/cocos/2d/CCGrid.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCDirector.h" #include "2d/CCNode.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 64439726b2..9372b247fd 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -27,9 +27,9 @@ #include "2d/CCFontAtlasCache.h" #include "2d/CCSprite.h" #include "2d/CCLabelTextFormatter.h" -#include "2d/ccUTF8.h" +#include "base/ccUTF8.h" #include "2d/CCSpriteFrame.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "2d/CCFont.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCRenderer.h" diff --git a/cocos/2d/CCLabelAtlas.cpp b/cocos/2d/CCLabelAtlas.cpp index ee8b209331..f051917c84 100644 --- a/cocos/2d/CCLabelAtlas.cpp +++ b/cocos/2d/CCLabelAtlas.cpp @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCLabelAtlas.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" #include "2d/CCDrawingPrimitives.h" +#include "platform/CCFileUtils.h" #include "base/ccConfig.h" +#include "base/CCDirector.h" +#include "renderer/CCTextureCache.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" -// external + #include "deprecated/CCString.h" #if CC_LABELATLAS_DEBUG_DRAW diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp index a64ba30140..580e9ff5c8 100644 --- a/cocos/2d/CCLabelTextFormatter.cpp +++ b/cocos/2d/CCLabelTextFormatter.cpp @@ -23,10 +23,11 @@ THE SOFTWARE. ****************************************************************************/ +#include "2d/CCLabelTextFormatter.h" + #include -#include "ccUTF8.h" -#include "CCLabelTextFormatter.h" +#include "base/ccUTF8.h" #include "base/CCDirector.h" #include "2d/CCLabel.h" diff --git a/cocos/2d/CCLabelTextFormatter.h b/cocos/2d/CCLabelTextFormatter.h index 2b15b456a6..664310a8b3 100644 --- a/cocos/2d/CCLabelTextFormatter.h +++ b/cocos/2d/CCLabelTextFormatter.h @@ -26,6 +26,8 @@ #ifndef _CCLabelTextFormatter_h_ #define _CCLabelTextFormatter_h_ +#include "base/CCPlatformMacros.h" + NS_CC_BEGIN class Label; diff --git a/cocos/2d/CCLayer.cpp b/cocos/2d/CCLayer.cpp index de60f31a02..6777dd4c05 100644 --- a/cocos/2d/CCLayer.cpp +++ b/cocos/2d/CCLayer.cpp @@ -27,8 +27,8 @@ THE SOFTWARE. #include #include "2d/CCLayer.h" -#include "2d/CCScriptSupport.h" -#include "2d/platform/CCDevice.h" +#include "base/CCScriptSupport.h" +#include "platform/CCDevice.h" #include "2d/CCScene.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index 363d2aab8e..4f8bdb3046 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCLAYER_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "base/CCEventTouch.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" diff --git a/cocos/2d/CCMenuItem.cpp b/cocos/2d/CCMenuItem.cpp index 79891fbb9a..ceda096b82 100644 --- a/cocos/2d/CCMenuItem.cpp +++ b/cocos/2d/CCMenuItem.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "CCLabelAtlas.h" #include "2d/CCLabel.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include "deprecated/CCString.h" #include #include diff --git a/cocos/2d/CCMenuItem.h b/cocos/2d/CCMenuItem.h index 6af521c09f..2152046acc 100644 --- a/cocos/2d/CCMenuItem.h +++ b/cocos/2d/CCMenuItem.h @@ -33,7 +33,7 @@ THE SOFTWARE. // cocos2d includes #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" NS_CC_BEGIN diff --git a/cocos/2d/CCMotionStreak.cpp b/cocos/2d/CCMotionStreak.cpp index 09fa33dc68..585ef38cdc 100644 --- a/cocos/2d/CCMotionStreak.cpp +++ b/cocos/2d/CCMotionStreak.cpp @@ -23,16 +23,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #include "2d/CCMotionStreak.h" -#include "2d/CCTextureCache.h" -#include "2d/CCVertex.h" +#include "math/CCVertex.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "renderer/CCTextureCache.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 diff --git a/cocos/2d/CCMotionStreak.h b/cocos/2d/CCMotionStreak.h index 20cfcf87ef..d4c5a1c47c 100644 --- a/cocos/2d/CCMotionStreak.h +++ b/cocos/2d/CCMotionStreak.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCMOTION_STREAK_H__ #define __CCMOTION_STREAK_H__ -#include "2d/CCProtocols.h" -#include "2d/CCTexture2D.h" +#include "base/CCProtocols.h" +#include "renderer/CCTexture2D.h" #include "base/ccTypes.h" #include "2d/CCNode.h" #include "renderer/CCCustomCommand.h" diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index 461550ab50..d7451357ac 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -36,10 +36,10 @@ THE SOFTWARE. #include "base/CCEventDispatcher.h" #include "base/CCEvent.h" #include "base/CCEventTouch.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" #include "2d/CCGrid.h" #include "2d/CCActionManager.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include "2d/CCScene.h" #include "2d/CCComponent.h" #include "2d/CCComponentContainer.h" diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index f8a52ca287..e08fa3d779 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -32,11 +32,11 @@ #include "base/ccMacros.h" #include "base/CCEventDispatcher.h" #include "base/CCVector.h" +#include "base/CCScriptSupport.h" +#include "base/CCProtocols.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 diff --git a/cocos/2d/CCParallaxNode.cpp b/cocos/2d/CCParallaxNode.cpp index 86f89e867f..89c1480d0d 100644 --- a/cocos/2d/CCParallaxNode.cpp +++ b/cocos/2d/CCParallaxNode.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCParallaxNode.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleBatchNode.cpp b/cocos/2d/CCParticleBatchNode.cpp index 9b2177fe28..6b19d4457e 100644 --- a/cocos/2d/CCParticleBatchNode.cpp +++ b/cocos/2d/CCParticleBatchNode.cpp @@ -30,16 +30,16 @@ #include "2d/CCParticleBatchNode.h" -#include "2d/CCTextureCache.h" -#include "2d/CCTextureAtlas.h" +#include "renderer/CCTextureAtlas.h" #include "2d/CCGrid.h" #include "2d/CCParticleSystem.h" -#include "2d/platform/CCFileUtils.h" +#include "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/CCTextureCache.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" diff --git a/cocos/2d/CCParticleBatchNode.h b/cocos/2d/CCParticleBatchNode.h index 2b6d716a94..a967425fca 100644 --- a/cocos/2d/CCParticleBatchNode.h +++ b/cocos/2d/CCParticleBatchNode.h @@ -31,7 +31,7 @@ #define __CCPARTICLEBATCHNODE_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "renderer/CCBatchCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleExamples.cpp b/cocos/2d/CCParticleExamples.cpp index 6498740b76..6869dc79f2 100644 --- a/cocos/2d/CCParticleExamples.cpp +++ b/cocos/2d/CCParticleExamples.cpp @@ -24,11 +24,12 @@ 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 "CCParticleExamples.h" + +#include "2d/CCParticleExamples.h" +#include "platform/CCImage.h" #include "base/CCDirector.h" -#include "2d/CCTextureCache.h" -#include "firePngData.h" -#include "2d/platform/CCImage.h" +#include "base/firePngData.h" +#include "renderer/CCTextureCache.h" NS_CC_BEGIN // diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp index eafe9e19d0..724b196724 100644 --- a/cocos/2d/CCParticleSystem.cpp +++ b/cocos/2d/CCParticleSystem.cpp @@ -42,21 +42,21 @@ THE SOFTWARE. // cocos2d uses a another approach, but the results are almost identical. // -#include "CCParticleSystem.h" +#include "2d/CCParticleSystem.h" #include -#include "CCParticleBatchNode.h" +#include "2d/CCParticleBatchNode.h" +#include "renderer/CCTextureAtlas.h" +#include "platform/CCFileUtils.h" +#include "platform/CCImage.h" #include "base/ccTypes.h" -#include "2d/CCTextureCache.h" -#include "2d/CCTextureAtlas.h" #include "base/base64.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/platform/CCImage.h" #include "base/ZipUtils.h" #include "base/CCDirector.h" #include "base/CCProfiling.h" -// opengl +#include "renderer/CCTextureCache.h" + #include "CCGL.h" using namespace std; diff --git a/cocos/2d/CCParticleSystem.h b/cocos/2d/CCParticleSystem.h index fc2050b7b4..55d85c3446 100644 --- a/cocos/2d/CCParticleSystem.h +++ b/cocos/2d/CCParticleSystem.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CCPARTICLE_SYSTEM_H__ #define __CCPARTICLE_SYSTEM_H__ -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "2d/CCNode.h" #include "base/CCValue.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCParticleSystemQuad.cpp b/cocos/2d/CCParticleSystemQuad.cpp index fc4f5fd779..02d02dfe36 100644 --- a/cocos/2d/CCParticleSystemQuad.cpp +++ b/cocos/2d/CCParticleSystemQuad.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include "2d/CCParticleSystemQuad.h" #include "2d/CCSpriteFrame.h" #include "2d/CCParticleBatchNode.h" -#include "2d/CCTextureAtlas.h" +#include "renderer/CCTextureAtlas.h" #include "base/CCDirector.h" #include "base/CCEventType.h" #include "base/CCConfiguration.h" diff --git a/cocos/2d/CCProgressTimer.cpp b/cocos/2d/CCProgressTimer.cpp index d3249380fb..d0cbabdf87 100644 --- a/cocos/2d/CCProgressTimer.cpp +++ b/cocos/2d/CCProgressTimer.cpp @@ -27,8 +27,8 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "2d/CCTextureCache.h" #include "2d/CCDrawingPrimitives.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" #include "renderer/ccGLStateCache.h" diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index 436e07daa8..f11364a019 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -24,27 +24,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCConfiguration.h" #include "2d/CCRenderTexture.h" + +#include "base/ccUtils.h" +#include "platform/CCImage.h" +#include "platform/CCFileUtils.h" +#include "2d/CCGrid.h" +#include "base/CCEventType.h" +#include "base/CCConfiguration.h" +#include "base/CCConfiguration.h" #include "base/CCDirector.h" -#include "2d/platform/CCImage.h" +#include "base/CCEventListenerCustom.h" +#include "base/CCEventDispatcher.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" -#include "base/CCConfiguration.h" -#include "2d/ccUtils.h" -#include "2d/CCTextureCache.h" -#include "2d/platform/CCFileUtils.h" -#include "CCGL.h" -#include "base/CCEventType.h" -#include "2d/CCGrid.h" - +#include "renderer/CCTextureCache.h" #include "renderer/CCRenderer.h" #include "renderer/CCGroupCommand.h" #include "renderer/CCCustomCommand.h" -// extern -#include "base/CCEventListenerCustom.h" -#include "base/CCEventDispatcher.h" +#include "CCGL.h" + NS_CC_BEGIN diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h index d3f7ece158..47f2c506df 100644 --- a/cocos/2d/CCRenderTexture.h +++ b/cocos/2d/CCRenderTexture.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "2d/CCSprite.h" -#include "2d/platform/CCImage.h" +#include "platform/CCImage.h" #include "renderer/CCGroupCommand.h" #include "renderer/CCCustomCommand.h" diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp index a5c2049310..b922554d18 100644 --- a/cocos/2d/CCSprite.cpp +++ b/cocos/2d/CCSprite.cpp @@ -26,14 +26,18 @@ THE SOFTWARE. ****************************************************************************/ #include "2d/CCSprite.h" + +#include +#include + #include "2d/CCSpriteBatchNode.h" #include "2d/CCAnimation.h" #include "2d/CCAnimationCache.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -#include "2d/CCTextureCache.h" #include "2d/CCDrawingPrimitives.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTextureCache.h" +#include "renderer/CCTexture2D.h" #include "renderer/CCGLProgramState.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgram.h" @@ -48,8 +52,6 @@ THE SOFTWARE. #include "deprecated/CCString.h" -#include -#include NS_CC_BEGIN diff --git a/cocos/2d/CCSprite.h b/cocos/2d/CCSprite.h index 38d826fdb6..29935d7404 100644 --- a/cocos/2d/CCSprite.h +++ b/cocos/2d/CCSprite.h @@ -29,8 +29,8 @@ THE SOFTWARE. #define __SPRITE_NODE_CCSPRITE_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" -#include "2d/CCTextureAtlas.h" +#include "base/CCProtocols.h" +#include "renderer/CCTextureAtlas.h" #include "base/ccTypes.h" #include #ifdef EMSCRIPTEN diff --git a/cocos/2d/CCSpriteBatchNode.cpp b/cocos/2d/CCSpriteBatchNode.cpp index 4c44ae543e..474704247c 100644 --- a/cocos/2d/CCSpriteBatchNode.cpp +++ b/cocos/2d/CCSpriteBatchNode.cpp @@ -28,15 +28,17 @@ THE SOFTWARE. #include "2d/CCSpriteBatchNode.h" +#include + #include "2d/CCSprite.h" #include "2d/CCGrid.h" #include "2d/CCDrawingPrimitives.h" -#include "2d/CCTextureCache.h" #include "2d/CCLayer.h" #include "2d/CCScene.h" #include "base/ccConfig.h" #include "base/CCDirector.h" #include "base/CCProfiling.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" @@ -46,8 +48,6 @@ THE SOFTWARE. #include "deprecated/CCString.h" // For StringUtils::format -// external -#include NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteBatchNode.h b/cocos/2d/CCSpriteBatchNode.h index 6f59a65ba1..6bdbac905d 100644 --- a/cocos/2d/CCSpriteBatchNode.h +++ b/cocos/2d/CCSpriteBatchNode.h @@ -32,9 +32,9 @@ THE SOFTWARE. #include #include "2d/CCNode.h" -#include "2d/CCProtocols.h" -#include "2d/CCTextureAtlas.h" +#include "base/CCProtocols.h" #include "base/ccMacros.h" +#include "renderer/CCTextureAtlas.h" #include "renderer/CCBatchCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteFrame.cpp b/cocos/2d/CCSpriteFrame.cpp index 86f46dc809..51d02c4d73 100644 --- a/cocos/2d/CCSpriteFrame.cpp +++ b/cocos/2d/CCSpriteFrame.cpp @@ -24,7 +24,8 @@ 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/CCTextureCache.h" + +#include "renderer/CCTextureCache.h" #include "2d/CCSpriteFrame.h" #include "base/CCDirector.h" diff --git a/cocos/2d/CCSpriteFrame.h b/cocos/2d/CCSpriteFrame.h index bea7424ba3..9a534fbcdc 100644 --- a/cocos/2d/CCSpriteFrame.h +++ b/cocos/2d/CCSpriteFrame.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __SPRITE_CCSPRITE_FRAME_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "base/CCRef.h" #include "math/CCGeometry.h" diff --git a/cocos/2d/CCSpriteFrameCache.cpp b/cocos/2d/CCSpriteFrameCache.cpp index 4f9cedfa9e..2bd0dcc782 100644 --- a/cocos/2d/CCSpriteFrameCache.cpp +++ b/cocos/2d/CCSpriteFrameCache.cpp @@ -27,17 +27,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCNS.h" -#include "base/ccMacros.h" -#include "2d/CCTextureCache.h" #include "2d/CCSpriteFrameCache.h" + +#include + #include "2d/CCSpriteFrame.h" #include "2d/CCSprite.h" -#include "math/TransformUtils.h" -#include "2d/platform/CCFileUtils.h" -#include "deprecated/CCString.h" +#include "platform/CCFileUtils.h" +#include "base/CCNS.h" +#include "base/ccMacros.h" #include "base/CCDirector.h" -#include +#include "renderer/CCTextureCache.h" +#include "math/TransformUtils.h" + +#include "deprecated/CCString.h" + using namespace std; diff --git a/cocos/2d/CCSpriteFrameCache.h b/cocos/2d/CCSpriteFrameCache.h index d4c592e34d..7e01d33e7d 100644 --- a/cocos/2d/CCSpriteFrameCache.h +++ b/cocos/2d/CCSpriteFrameCache.h @@ -36,7 +36,7 @@ THE SOFTWARE. */ #include "2d/CCSpriteFrame.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" #include "base/CCRef.h" #include "base/CCValue.h" #include "base/CCMap.h" diff --git a/cocos/2d/CCTMXLayer.cpp b/cocos/2d/CCTMXLayer.cpp index 8a61292f57..d763dabbf9 100644 --- a/cocos/2d/CCTMXLayer.cpp +++ b/cocos/2d/CCTMXLayer.cpp @@ -24,15 +24,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 "2d/CCTMXLayer.h" + #include "2d/CCTMXXMLParser.h" #include "2d/CCTMXTiledMap.h" #include "2d/CCSprite.h" -#include "2d/CCTextureCache.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" +#include "base/CCDirector.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" -#include "base/CCDirector.h" #include "deprecated/CCString.h" // For StringUtils::format diff --git a/cocos/2d/CCTMXLayer.h b/cocos/2d/CCTMXLayer.h index 58ffa34db4..2ab316b90e 100644 --- a/cocos/2d/CCTMXLayer.h +++ b/cocos/2d/CCTMXLayer.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "CCAtlasNode.h" #include "2d/CCSpriteBatchNode.h" #include "CCTMXXMLParser.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" NS_CC_BEGIN class TMXMapInfo; diff --git a/cocos/2d/CCTMXXMLParser.cpp b/cocos/2d/CCTMXXMLParser.cpp index a2de4100a6..7d42c9c978 100644 --- a/cocos/2d/CCTMXXMLParser.cpp +++ b/cocos/2d/CCTMXXMLParser.cpp @@ -31,7 +31,7 @@ THE SOFTWARE. #include "CCTMXXMLParser.h" #include "CCTMXTiledMap.h" #include "base/ccMacros.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/ZipUtils.h" #include "base/base64.h" #include "base/CCDirector.h" diff --git a/cocos/2d/CCTMXXMLParser.h b/cocos/2d/CCTMXXMLParser.h index 94621db3b0..dde1c4f535 100644 --- a/cocos/2d/CCTMXXMLParser.h +++ b/cocos/2d/CCTMXXMLParser.h @@ -30,7 +30,7 @@ THE SOFTWARE. #define __CC_TM_XML_PARSER__ #include "math/CCGeometry.h" -#include "2d/platform/CCSAXParser.h" +#include "platform/CCSAXParser.h" #include "base/CCVector.h" #include "base/CCValue.h" diff --git a/cocos/2d/CCTextFieldTTF.h b/cocos/2d/CCTextFieldTTF.h index 98b3283492..5c4eb4f54d 100644 --- a/cocos/2d/CCTextFieldTTF.h +++ b/cocos/2d/CCTextFieldTTF.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CC_TEXT_FIELD_H__ #include "2d/CCLabel.h" -#include "2d/CCIMEDelegate.h" +#include "base/CCIMEDelegate.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTileMapAtlas.cpp b/cocos/2d/CCTileMapAtlas.cpp index 77f4e7d43f..03b1633ba2 100644 --- a/cocos/2d/CCTileMapAtlas.cpp +++ b/cocos/2d/CCTileMapAtlas.cpp @@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCTileMapAtlas.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/CCTextureAtlas.h" -#include "TGAlib.h" +#include "platform/CCFileUtils.h" +#include "renderer/CCTextureAtlas.h" +#include "base/TGAlib.h" #include "base/ccConfig.h" #include "base/CCDirector.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt index a164b8a64f..630aa69782 100644 --- a/cocos/2d/CMakeLists.txt +++ b/cocos/2d/CMakeLists.txt @@ -2,43 +2,19 @@ if(WIN32) ADD_DEFINITIONS(-DUNICODE -D_UNICODE) -set(COCOS_2D_PLATFORM_SRC - 2d/platform/win32/CCStdC.cpp - 2d/platform/win32/CCFileUtilsWin32.cpp - 2d/platform/win32/CCCommon.cpp - 2d/platform/win32/CCApplication.cpp - 2d/platform/desktop/CCGLView.cpp - 2d/platform/win32/CCDevice.cpp -) - -elseif(APPLE) - -else() - -set(COCOS_2D_PLATFORM_SRC - 2d/platform/linux/CCStdC.cpp - 2d/platform/linux/CCFileUtilsLinux.cpp - 2d/platform/linux/CCCommon.cpp - 2d/platform/linux/CCApplication.cpp - 2d/platform/desktop/CCGLView.cpp - 2d/platform/linux/CCDevice.cpp -) - 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/CCActionGrid.cpp 2d/CCActionGrid3D.cpp + 2d/CCActionGrid.cpp 2d/CCActionInstant.cpp 2d/CCActionInterval.cpp 2d/CCActionManager.cpp @@ -46,29 +22,28 @@ set(COCOS_2D_SRC 2d/CCActionProgressTimer.cpp 2d/CCActionTiledGrid.cpp 2d/CCActionTween.cpp - 2d/CCAnimation.cpp 2d/CCAnimationCache.cpp + 2d/CCAnimation.cpp 2d/CCAtlasNode.cpp 2d/CCClippingNode.cpp - 2d/CCComponent.cpp 2d/CCComponentContainer.cpp - 2d/CCDrawNode.cpp + 2d/CCComponent.cpp 2d/CCDrawingPrimitives.cpp - 2d/CCFont.cpp - 2d/CCFontAtlas.cpp + 2d/CCDrawNode.cpp 2d/CCFontAtlasCache.cpp + 2d/CCFontAtlas.cpp 2d/CCFontCharMap.cpp + 2d/CCFont.cpp 2d/CCFontFNT.cpp 2d/CCFontFreeType.cpp 2d/CCGLBufferedNode.cpp 2d/CCGrabber.cpp 2d/CCGrid.cpp - 2d/CCIMEDispatcher.cpp - 2d/CCLabel.cpp 2d/CCLabelAtlas.cpp 2d/CCLabelBMFont.cpp - 2d/CCLabelTTF.cpp + 2d/CCLabel.cpp 2d/CCLabelTextFormatter.cpp + 2d/CCLabelTTF.cpp 2d/CCLayer.cpp 2d/CCMenu.cpp 2d/CCMenuItem.cpp @@ -83,38 +58,19 @@ set(COCOS_2D_SRC 2d/CCProgressTimer.cpp 2d/CCRenderTexture.cpp 2d/CCScene.cpp - 2d/CCScriptSupport.cpp - 2d/CCSprite.cpp 2d/CCSpriteBatchNode.cpp - 2d/CCSpriteFrame.cpp + 2d/CCSprite.cpp 2d/CCSpriteFrameCache.cpp + 2d/CCSpriteFrame.cpp + 2d/CCTextFieldTTF.cpp + 2d/CCTileMapAtlas.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/CCTransition.cpp 2d/CCTransitionPageTurn.cpp 2d/CCTransitionProgress.cpp 2d/CCTweenFunction.cpp - 2d/CCUserDefault.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 - ../external/edtaa3func/edtaa3func.cpp - ../external/ConvertUTF/ConvertUTFWrapper.cpp - ../external/ConvertUTF/ConvertUTF.c ) diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index e5b1b92dc4..08ffc2fc9e 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -175,9 +175,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + @@ -198,15 +203,23 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + @@ -217,13 +230,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + - - - - + + + @@ -234,6 +248,17 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + @@ -242,10 +267,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + @@ -262,7 +291,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -274,11 +302,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - - @@ -289,6 +315,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -297,15 +324,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - @@ -315,22 +338,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - - - - - - @@ -339,9 +346,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + @@ -364,21 +376,33 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + @@ -395,13 +419,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + - - - - + + + @@ -413,6 +438,21 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + + + + @@ -421,11 +461,15 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + @@ -442,7 +486,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -454,12 +497,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - - - @@ -470,24 +510,20 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + - - - - - @@ -497,58 +533,15 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index ec392a9884..8b792ef611 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -1,108 +1,60 @@  - - {cc64f5ad-2234-494c-9c51-b7a20c8887aa} - - - {736cf4ab-e0d6-40ba-912a-b062d28d318a} - - - {1c7c61b8-3d36-4ba0-a87c-457eb4c782d0} - - - {0b3a64bd-79fa-476a-a461-6b97e5072453} - - - {e455af5e-da09-4f41-b79f-df4dd311820d} - - - {206bd96b-f80e-4722-8675-d7c6ff9b3639} - - - {075492ba-08bc-404c-92da-32029797a600} - - - {41abe422-1602-4fe0-ac1c-6b04a14c1abb} - - - {8bf0f517-2ac3-4fc3-a1ad-999d9ea103cd} - - - {926fc31c-8742-4984-9940-c972dd02fc8a} - - - {9428f8e6-4ce3-4596-b8af-14d70b7c5b5d} - - - {755e5282-111e-46a5-9169-7c12b37f5ffc} - - - {d94bbf20-8de9-49a7-ae20-6a1140cf633b} - - - {4a64789e-cc8d-4f84-a869-e6dae2e0d58c} - - - {bb98a889-9a48-4e31-af2f-117f14da388a} - - - {fdea327e-b905-47db-8c33-b70d7866166b} - - - {46c8d130-b8b5-47f5-a063-ca700e1c32cc} - - - {f2671200-b2d8-4d2e-9728-06719cf6f835} - - - {535c04b0-fe2b-44c9-9a8c-9029e2b6de5c} - - - {5b082c5c-d396-43ca-b3b1-997d0f6247d0} - - - {1179d205-d065-49f0-8457-bc4c3f1d0cb3} - - - {cc25bb83-527d-4218-8d68-ebf963ce7698} - - - {c45b97e8-fa1f-4e58-8ec5-d46371c2dd26} - - - {caa78ce0-9b58-4314-b117-1acae278691e} - - - {47fda93e-6eb4-4abc-b5bc-725bf667a395} - {08593631-5bf5-46aa-9436-62595c4f7bf6} {aeadfa95-9c89-4212-98ae-89ad57db596a} - - {aec8225f-81a7-4213-b97b-7004d5535398} - - - {cba0f362-878c-438b-ad0f-43d287516357} - - - {32373f63-2c2d-4eab-bc4a-21745ba0b3fb} - - - {b4e2b1e5-2d79-44a3-af45-728d47b7bdb2} - {0b1152b1-c732-4560-8629-87843b0fbd7c} - - {02a21a86-8f65-441b-ae13-11dec1c45ee5} + + {0965e868-aacd-4d73-9c78-31d3cdaaed52} - + + {4d0146d9-df5b-4430-a426-60aa395750a6} + + + {a495c9fc-5276-476d-ba6b-5d627b31ef30} + + + {87a7d557-f382-477f-b183-69901a320c17} + + + {9ac3f4cb-fb7b-4bcc-8b5b-1d454f2ff564} + + + {fdea951b-e91d-45da-b5bd-22a1b875960a} + + + {3622d05e-fcef-4d4b-a51d-771d1c13a2ef} + + + {a565f213-2d13-4d2d-a3a0-5b2d06cbd05f} + + + {ec174f10-2de3-4568-9f30-b2f0a4e9396e} + + + {364c3b8c-77eb-46ed-a866-a8686b1b65bc} + + + {589928bf-e550-41f1-ae21-64443dd5fe21} + + + {1849ae10-8a10-4784-bbad-66fa67a1ed04} + + {6c1e4a6b-c168-436b-aa63-0af7f4caebf9} + + {b4e2b1e5-2d79-44a3-af45-728d47b7bdb2} + + + {a20c4bdc-bd4c-40c1-a78a-fe31cd3ec76a} + @@ -120,262 +72,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - - - support - physics\chipmunk @@ -391,23 +87,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - platform\desktop - - - platform - - xxhash + external\xxhash deprecated @@ -428,12 +109,213 @@ deprecated + + external\ConvertUTF + + + external\ConvertUTF + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + base + base base + + base + base @@ -461,6 +343,9 @@ base + + base + base @@ -473,6 +358,9 @@ base + + base + base @@ -488,6 +376,9 @@ base + + base + base @@ -500,51 +391,63 @@ base + + base + base base + + base + + + base + + + base + + + base + base + + base + + + base + + + base + base - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - renderer renderer + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + renderer @@ -557,38 +460,110 @@ renderer - - base - - - base - - - renderer - - - renderer - - - renderer - - - renderer - renderer - + renderer - - ConvertUTF + + renderer - - ConvertUTF + + renderer - - actions + + platform\desktop + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + platform + + + platform + + + platform + + + platform + + + platform + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base + + + renderer + + + 3d + + + 3d + + + 3d + + + 3d @@ -607,292 +582,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - include - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\data_support - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - physics\chipmunk @@ -911,20 +600,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - platform\desktop - - xxhash + external\xxhash deprecated @@ -957,12 +634,210 @@ deprecated + + external\ConvertUTF + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + base + base base + + base + base @@ -993,6 +868,9 @@ base + + base + base @@ -1005,6 +883,9 @@ base + + base + base @@ -1023,6 +904,9 @@ base + + base + base @@ -1032,9 +916,18 @@ base + + base + + + base + base + + base + base @@ -1044,53 +937,50 @@ base + + base + base base + + base + + + base + + + base + base base - + base - - math + + base - - math + + base - - math + + base - - math + + base - - math + + base - - math - - - math - - - math - - - math - - - math - - - math + + base renderer @@ -1098,6 +988,21 @@ renderer + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + renderer @@ -1113,120 +1018,154 @@ renderer - - base - - - base - - - renderer - - - renderer - - - renderer - - - renderer - renderer - + renderer - - ConvertUTF + + renderer - - actions + + renderer - - - + + platform\desktop + + + platform\win32\compat + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + math - + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base + + + base + + + renderer + + + 3d + + + 3d + + + 3d + + + 3d + + + math + math math - - math - math - + math - + math - + math - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - \ No newline at end of file diff --git a/cocos/2d/cocos2d_headers.props b/cocos/2d/cocos2d_headers.props index 51362bbae4..afdcd49a10 100644 --- a/cocos/2d/cocos2d_headers.props +++ b/cocos/2d/cocos2d_headers.props @@ -7,7 +7,7 @@ - $(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\win32;$(EngineRoot)cocos\2d\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES + $(EngineRoot)cocos;$(EngineRoot)cocos\platform\win32;$(EngineRoot)cocos\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES _VARIADIC_MAX=10;%(PreprocessorDefinitions) diff --git a/cocos/2d/cocos2d_winrt_headers.props b/cocos/2d/cocos2d_winrt_headers.props index a9c86090e4..fd510616e4 100644 --- a/cocos/2d/cocos2d_winrt_headers.props +++ b/cocos/2d/cocos2d_winrt_headers.props @@ -7,7 +7,7 @@ - $(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; + $(EngineRoot)cocos;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(GeneratedFilesDir);$(EngineRoot)external\ConvertUTF; diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index 1b145bce6f..91de9b40b0 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -75,7 +75,7 @@ %(PreprocessorDefinitions) - Use + NotUsing pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(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\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) @@ -100,7 +100,7 @@ _LIB;NDEBUG;%(PreprocessorDefinitions) - Use + NotUsing pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(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\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) @@ -125,7 +125,7 @@ _LIB;%(PreprocessorDefinitions) - Use + NotUsing pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(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\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) @@ -151,7 +151,7 @@ _LIB;NDEBUG;%(PreprocessorDefinitions) - Use + NotUsing pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(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\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) @@ -222,9 +222,14 @@ NotUsing NotUsing + + + + + @@ -245,15 +250,34 @@ + + false + false + + + + + + + + + + + + + + + + @@ -264,13 +288,14 @@ + + - - - - + + + @@ -281,6 +306,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -289,10 +335,14 @@ + + + + @@ -309,7 +359,6 @@ - @@ -321,28 +370,9 @@ - - false - false - false - false - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - + - - @@ -353,6 +383,7 @@ + @@ -361,15 +392,11 @@ - - - - @@ -379,54 +406,6 @@ - - - - - - - - - - - - - - - - - - - true - true - true - true - Create - Create - pch.h - Cdecl - Cdecl - Cdecl - Cdecl - Create - Create - pch.h - - - - Create - Create - Create - Create - false - false - false - false - - - - - @@ -435,9 +414,14 @@ + + + + + @@ -460,21 +444,33 @@ + + + + + + + + + + + + @@ -490,13 +486,14 @@ + + - - - - + + + @@ -508,6 +505,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -516,11 +540,15 @@ + + + + @@ -537,55 +565,44 @@ - - - - + - - - - + - - - - - @@ -594,49 +611,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + @@ -661,6 +645,6 @@ - + \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index 10ccab392c..ee4a610d9f 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -1,87 +1,15 @@  - - {cc64f5ad-2234-494c-9c51-b7a20c8887aa} - - - {736cf4ab-e0d6-40ba-912a-b062d28d318a} - - - {1c7c61b8-3d36-4ba0-a87c-457eb4c782d0} - - - {0b3a64bd-79fa-476a-a461-6b97e5072453} - - - {e455af5e-da09-4f41-b79f-df4dd311820d} - - - {206bd96b-f80e-4722-8675-d7c6ff9b3639} - - - {075492ba-08bc-404c-92da-32029797a600} - - - {41abe422-1602-4fe0-ac1c-6b04a14c1abb} - - - {8bf0f517-2ac3-4fc3-a1ad-999d9ea103cd} - {926fc31c-8742-4984-9940-c972dd02fc8a} - - {755e5282-111e-46a5-9169-7c12b37f5ffc} - - - {d94bbf20-8de9-49a7-ae20-6a1140cf633b} - - - {4a64789e-cc8d-4f84-a869-e6dae2e0d58c} - - - {bb98a889-9a48-4e31-af2f-117f14da388a} - - - {fdea327e-b905-47db-8c33-b70d7866166b} - - - {46c8d130-b8b5-47f5-a063-ca700e1c32cc} - - - {f2671200-b2d8-4d2e-9728-06719cf6f835} - - - {535c04b0-fe2b-44c9-9a8c-9029e2b6de5c} - - - {5b082c5c-d396-43ca-b3b1-997d0f6247d0} - - - {1179d205-d065-49f0-8457-bc4c3f1d0cb3} - - - {cc25bb83-527d-4218-8d68-ebf963ce7698} - - - {c45b97e8-fa1f-4e58-8ec5-d46371c2dd26} - - - {caa78ce0-9b58-4314-b117-1acae278691e} - - - {47fda93e-6eb4-4abc-b5bc-725bf667a395} - {08593631-5bf5-46aa-9436-62595c4f7bf6} {aeadfa95-9c89-4212-98ae-89ad57db596a} - - {aec8225f-81a7-4213-b97b-7004d5535398} - {cba0f362-878c-438b-ad0f-43d287516357} @@ -91,21 +19,42 @@ {14e6de7a-f7ef-4249-9141-abf17033d9c2} - - {a36c6808-a8d6-43f4-bfb0-e08ee2747a21} - {5598fb0c-c012-45b6-8e43-447e7891b61d} + + {fdee8fd3-05f9-46a1-aa15-6ceb16358145} + + + {f3673af7-9bbd-463b-a3a9-a081e67248d8} + + + {fbaf3e74-09dc-4f89-9d5a-0e7ccabbfbff} + - {9bbf7050-757b-41b1-ab15-418db52c2023} + {41c1aef6-86c9-42e3-b68c-6da3107ff587} - - {3237780d-1154-4049-bf53-151c421f26e9} + + {a03a9ca0-013a-4082-bb45-43f024ff0f4e} - + + {0e7c99cb-0b41-4120-9773-49c31345d829} + + + {729473cd-a9e2-4133-b78e-37a6c3687550} + + + {54949861-d861-4eea-89bf-0498ef3c338c} + + + {64846670-6658-45f9-84cf-29e013870c37} + + {026f880b-7918-49f8-8f0d-00f7593ce326} + + {a36c6808-a8d6-43f4-bfb0-e08ee2747a21} + @@ -123,247 +72,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - - - support - physics\chipmunk @@ -379,57 +87,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - platform - - - - platform\wp8 - - - platform\wp8 - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - xxhash + external\xxhash deprecated @@ -449,37 +108,301 @@ deprecated - - platform\winrt - - - platform\winrt - - + + external\ConvertUTF + + + external\ConvertUTF + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + math - + + math + + + math + + + math + + math math - + math - + math - + math + + math + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base + base base + + base + base @@ -507,6 +430,9 @@ base + + base + base @@ -519,6 +445,9 @@ base + + base + base @@ -534,6 +463,9 @@ base + + base + base @@ -546,75 +478,123 @@ base + + base + base base + + base + + + base + + + base + + + base + base + + base + + + base + + + base + base - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform\wp8 - - math + + platform\wp8 - - math + + platform\wp8 - - math + + platform\winrt - + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + base - - base + + 3d - + + 3d + + + 3d + + + 3d + + renderer - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - ConvertUTF - - - ConvertUTF - @@ -632,292 +612,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - include - - - include - - - include - - - include - - - include - - - include - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\data_support - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - physics\chipmunk @@ -936,57 +630,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - - platform\wp8 - - - platform\wp8 - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - xxhash + external\xxhash deprecated @@ -1018,14 +663,203 @@ deprecated - - platform\winrt + + external\ConvertUTF - - platform\winrt + + 2d - - platform\winrt + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + math + + + math math @@ -1033,30 +867,102 @@ math - + math - + + math + + math math - + math - + math - + math + + math + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base + base base + + base + base @@ -1087,6 +993,9 @@ base + + base + base @@ -1099,6 +1008,9 @@ base + + base + base @@ -1117,6 +1029,9 @@ base + + base + base @@ -1126,9 +1041,18 @@ base + + base + + + base + base + + base + base @@ -1138,171 +1062,246 @@ base + + base + base base + + base + + + base + + + base + base base + + base + + + base + + + base + + + base + + + base + + + base + base - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - math + + platform - - math + + platform\wp8 - - math + + platform\wp8 - + + platform\wp8 + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + base - + base - - renderer + + 3d - - renderer + + 3d - - renderer + + 3d - - renderer + + 3d - + renderer - - renderer - - - ConvertUTF - + + math + math math - - math - math - + math - + math - + math - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - - base + + renderer \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8_headers.props b/cocos/2d/cocos2d_wp8_headers.props index 0ff1cd875e..d9e60d6d8c 100644 --- a/cocos/2d/cocos2d_wp8_headers.props +++ b/cocos/2d/cocos2d_wp8_headers.props @@ -7,7 +7,7 @@ - $(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) + $(EngineRoot)cocos\platform\wp8;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(GeneratedFilesDir) _VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true diff --git a/cocos/3d/CCMesh.cpp b/cocos/3d/CCMesh.cpp new file mode 100644 index 0000000000..d7b61e22d1 --- /dev/null +++ b/cocos/3d/CCMesh.cpp @@ -0,0 +1,214 @@ +/**************************************************************************** + 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 "CCMesh.h" + +#include +#include +#include +#include + +#include "base/ccMacros.h" +#include "renderer/ccGLStateCache.h" +#include "CCObjLoader.h" +#include "CCSprite3DDataCache.h" + +using namespace std; + +NS_CC_BEGIN + +bool RenderMeshData::hasVertexAttrib(int attrib) +{ + for (auto itr = _vertexAttribs.begin(); itr != _vertexAttribs.end(); itr++) + { + if ((*itr).vertexAttrib == attrib) + return true; //already has + } + return false; +} + +bool RenderMeshData::initFrom(const std::vector& positions, + const std::vector& normals, + const std::vector& texs, + const std::vector& indices) +{ + CC_ASSERT(positions.size()<65536 * 3 && "index may out of bound"); + + _vertexAttribs.clear(); + _vertexsizeBytes = 0; + + _vertexNum = positions.size() / 3; //number of vertex + if (_vertexNum == 0) + return false; + + if ((normals.size() != 0 && _vertexNum * 3 != normals.size()) || (texs.size() != 0 && _vertexNum * 2 != texs.size())) + return false; + + _vertexsizeBytes += 3; + MeshVertexAttrib meshvertexattrib; + meshvertexattrib.size = 3; + meshvertexattrib.type = GL_FLOAT; + meshvertexattrib.attribSizeBytes = meshvertexattrib.size * sizeof(float); + meshvertexattrib.vertexAttrib = GLProgram::VERTEX_ATTRIB_POSITION; + _vertexAttribs.push_back(meshvertexattrib); + + //normal + if (normals.size()) + { + //add normal flag + _vertexsizeBytes += 3; + meshvertexattrib.vertexAttrib = GLProgram::VERTEX_ATTRIB_NORMAL; + _vertexAttribs.push_back(meshvertexattrib); + } + // + if (texs.size()) + { + _vertexsizeBytes += 2; + meshvertexattrib.size = 2; + meshvertexattrib.vertexAttrib = GLProgram::VERTEX_ATTRIB_TEX_COORD; + meshvertexattrib.attribSizeBytes = meshvertexattrib.size * sizeof(float); + _vertexAttribs.push_back(meshvertexattrib); + } + + _vertexs.clear(); + _vertexs.reserve(_vertexNum * _vertexsizeBytes); + _vertexsizeBytes *= sizeof(float); + + bool hasNormal = hasVertexAttrib(GLProgram::VERTEX_ATTRIB_NORMAL); + bool hasTexCoord = hasVertexAttrib(GLProgram::VERTEX_ATTRIB_TEX_COORD); + //position, normal, texCoordinate into _vertexs + for(int i = 0; i < _vertexNum; i++) + { + _vertexs.push_back(positions[i * 3]); + _vertexs.push_back(positions[i * 3 + 1]); + _vertexs.push_back(positions[i * 3 + 2]); + + if (hasNormal) + { + _vertexs.push_back(normals[i * 3]); + _vertexs.push_back(normals[i * 3 + 1]); + _vertexs.push_back(normals[i * 3 + 2]); + } + + if (hasTexCoord) + { + _vertexs.push_back(texs[i * 2]); + _vertexs.push_back(texs[i * 2 + 1]); + } + } + _indices = indices; + + return true; +} + +Mesh::Mesh() +:_vertexBuffer(0) +, _indexBuffer(0) +, _primitiveType(PrimitiveType::TRIANGLES) +, _indexFormat(IndexFormat::INDEX16) +, _indexCount(0) +{ +} + +Mesh::~Mesh() +{ + cleanAndFreeBuffers(); +} + +Mesh* Mesh::create(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices) +{ + auto mesh = new Mesh(); + if(mesh && mesh->init(positions, normals, texs, indices)) + { + mesh->autorelease(); + return mesh; + } + CC_SAFE_DELETE(mesh); + return nullptr; +} + +bool Mesh::init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices) +{ + bool bRet = _renderdata.initFrom(positions, normals, texs, indices); + if (!bRet) + return false; + + restore(); + return true; +} + +void Mesh::cleanAndFreeBuffers() +{ + if(glIsBuffer(_vertexBuffer)) + { + glDeleteBuffers(1, &_vertexBuffer); + _vertexBuffer = 0; + } + + if(glIsBuffer(_indexBuffer)) + { + glDeleteBuffers(1, &_indexBuffer); + _indexBuffer = 0; + } + _primitiveType = PrimitiveType::TRIANGLES; + _indexFormat = IndexFormat::INDEX16; + _indexCount = 0; +} + +void Mesh::buildBuffer() +{ + cleanAndFreeBuffers(); + + glGenBuffers(1, &_vertexBuffer); + glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer); + + glBufferData(GL_ARRAY_BUFFER, + _renderdata._vertexs.size() * sizeof(_renderdata._vertexs[0]), + &_renderdata._vertexs[0], + GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + + glGenBuffers(1, &_indexBuffer); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer); + + unsigned int indexSize = 2; + IndexFormat indexformat = IndexFormat::INDEX16; + + glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexSize * _renderdata._indices.size(), &_renderdata._indices[0], GL_STATIC_DRAW); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + + _primitiveType = PrimitiveType::TRIANGLES; + _indexFormat = indexformat; + _indexCount = _renderdata._indices.size(); +} + +void Mesh::restore() +{ + cleanAndFreeBuffers(); + buildBuffer(); +} + +NS_CC_END diff --git a/cocos/3d/CCMesh.h b/cocos/3d/CCMesh.h new file mode 100644 index 0000000000..1d0db67785 --- /dev/null +++ b/cocos/3d/CCMesh.h @@ -0,0 +1,133 @@ +/**************************************************************************** + 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 __CCMESH_H__ +#define __CCMESH_H__ + +#include +#include + +#include "base/CCRef.h" +#include "base/ccTypes.h" +#include "math/CCMath.h" +#include "renderer/CCGLProgram.h" + +NS_CC_BEGIN + +//mesh vertex attribute +struct MeshVertexAttrib +{ + //attribute size + GLint size; + //GL_FLOAT + GLenum type; + //VERTEX_ATTRIB_POSITION,VERTEX_ATTRIB_COLOR,VERTEX_ATTRIB_TEX_COORD,VERTEX_ATTRIB_NORMAL, GLProgram for detail + int vertexAttrib; + //size in bytes + int attribSizeBytes; +}; + +class RenderMeshData +{ + friend class Mesh; +public: + RenderMeshData(): _vertexsizeBytes(0) + { + } + bool hasVertexAttrib(int attrib); + bool initFrom(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices); + +protected: + int _vertexsizeBytes; + ssize_t _vertexNum; + std::vector _vertexs; + std::vector _indices; + std::vector _vertexAttribs; +}; + +/** Mesh: TODO, add description of Mesh */ +class Mesh : public Ref +{ +public: + /** Defines supported index formats. */ + enum class IndexFormat + { + INDEX8 = GL_UNSIGNED_BYTE, + INDEX16 = GL_UNSIGNED_SHORT, + }; + + /** Defines supported primitive types. */ + enum class PrimitiveType + { + TRIANGLES = GL_TRIANGLES, + TRIANGLE_STRIP = GL_TRIANGLE_STRIP, + LINES = GL_LINES, + LINE_STRIP = GL_LINE_STRIP, + POINTS = GL_POINTS + }; + + //create + static Mesh* create(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices); + + //get vertex buffer + inline GLuint getVertexBuffer() const { return _vertexBuffer; } + + //get mesh vertex attribute count + ssize_t getMeshVertexAttribCount() const { return _renderdata._vertexAttribs.size(); } + //get MeshVertexAttribute by index + const MeshVertexAttrib& getMeshVertexAttribute(int idx) const { return _renderdata._vertexAttribs[idx]; } + //has vertex attribute? + bool hasVertexAttrib(int attrib) { return _renderdata.hasVertexAttrib(attrib); } + //get per vertex size in bytes + int getVertexSizeInBytes() const { return _renderdata._vertexsizeBytes; } + + PrimitiveType getPrimitiveType() const { return _primitiveType; } + ssize_t getIndexCount() const { return _indexCount; } + IndexFormat getIndexFormat() const { return _indexFormat; } + GLuint getIndexBuffer() const {return _indexBuffer; } + + //build vertex buffer from renderdata + void restore(); + +protected: + Mesh(); + virtual ~Mesh(); + bool init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices); + + //build buffer + void buildBuffer(); + void cleanAndFreeBuffers(); + + PrimitiveType _primitiveType; + IndexFormat _indexFormat; + GLuint _vertexBuffer; + GLuint _indexBuffer; + ssize_t _indexCount; + + RenderMeshData _renderdata; +}; + +NS_CC_END + +#endif // __CCMESH_H_ diff --git a/cocos/3d/CCObjLoader.cpp b/cocos/3d/CCObjLoader.cpp new file mode 100644 index 0000000000..939de77984 --- /dev/null +++ b/cocos/3d/CCObjLoader.cpp @@ -0,0 +1,714 @@ +// +// Copyright 2012-2013, Syoyo Fujita. +// +// Licensed under 2-clause BSD liecense. +// + +// +// version 0.9.6: Support Ni(index of refraction) mtl parameter. +// Parse transmittance material parameter correctly. +// version 0.9.5: Parse multiple group name. +// Add support of specifying the base path to load material file. +// version 0.9.4: Initial suupport of group tag(g) +// version 0.9.3: Fix parsing triple 'x/y/z' +// version 0.9.2: Add more .mtl load support +// version 0.9.1: Add initial .mtl load support +// version 0.9.0: Initial +// + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "CCObjLoader.h" +#include "platform/CCFileUtils.h" + +NS_CC_BEGIN + +struct vertex_index +{ + int v_idx, vt_idx, vn_idx; + vertex_index() {}; + vertex_index(int idx) : v_idx(idx), vt_idx(idx), vn_idx(idx) {}; + vertex_index(int vidx, int vtidx, int vnidx) : v_idx(vidx), vt_idx(vtidx), vn_idx(vnidx) {}; + +}; +// for std::map +static inline bool operator<(const vertex_index& a, const vertex_index& b) +{ + if (a.v_idx != b.v_idx) return (a.v_idx < b.v_idx); + if (a.vn_idx != b.vn_idx) return (a.vn_idx < b.vn_idx); + if (a.vt_idx != b.vt_idx) return (a.vt_idx < b.vt_idx); + return false; +} + +struct obj_shape +{ + std::vector v; + std::vector vn; + std::vector vt; +}; + +static inline bool isSpace(const char c) +{ + return (c == ' ') || (c == '\t'); +} + +static inline bool isNewLine(const char c) +{ + return (c == '\r') || (c == '\n') || (c == '\0'); +} + +// Make index zero-base, and also support relative index. +static inline int fixIndex(int idx, int n) +{ + int i; + + if (idx > 0) { + i = idx - 1; + } else if (idx == 0) { + i = 0; + } else { // negative value = relative + i = n + idx; + } + return i; +} + +static inline std::string parseString(const char*& token) +{ + std::string s; + auto b = strspn(token, " \t"); + auto e = strcspn(token, " \t\r"); + s = std::string(&token[b], &token[e]); + + token += (e - b); + return s; +} + +static inline int parseInt(const char*& token) +{ + token += strspn(token, " \t"); + int i = atoi(token); + token += strcspn(token, " \t\r"); + return i; +} + +static inline float parseFloat(const char*& token) +{ + token += strspn(token, " \t"); + float f = (float)atof(token); + token += strcspn(token, " \t\r"); + return f; +} + +static inline void parseFloat2(float& x, float& y, const char*& token) +{ + x = parseFloat(token); + y = parseFloat(token); +} + +static inline void parseFloat3(float& x, float& y, float& z, const char*& token) +{ + x = parseFloat(token); + y = parseFloat(token); + z = parseFloat(token); +} + +// Parse triples: i, i/j/k, i//k, i/j +static vertex_index parseTriple(const char* &token, int vsize, int vnsize, int vtsize) +{ + vertex_index vi(-1); + + vi.v_idx = fixIndex(atoi(token), vsize); + token += strcspn(token, "/ \t\r"); + if (token[0] != '/') { + return vi; + } + token++; + + // i//k + if (token[0] == '/') { + token++; + vi.vn_idx = fixIndex(atoi(token), vnsize); + token += strcspn(token, "/ \t\r"); + return vi; + } + + // i/j/k or i/j + vi.vt_idx = fixIndex(atoi(token), vtsize); + token += strcspn(token, "/ \t\r"); + if (token[0] != '/') { + return vi; + } + + // i/j/k + token++; // skip '/' + vi.vn_idx = fixIndex(atoi(token), vnsize); + token += strcspn(token, "/ \t\r"); + return vi; +} + +static ssize_t updateVertex( std::map& vertexCache, std::vector& positions, std::vector& normals, + std::vector& texcoords, const std::vector& in_positions, const std::vector& in_normals, const std::vector& in_texcoords, + const vertex_index& i) +{ + const auto it = vertexCache.find(i); + + if (it != vertexCache.end()) + { + // found cache + return it->second; + } + + assert(in_positions.size() > (3*i.v_idx+2)); + + positions.push_back(in_positions[3*i.v_idx+0]); + positions.push_back(in_positions[3*i.v_idx+1]); + positions.push_back(in_positions[3*i.v_idx+2]); + + if (i.vn_idx >= 0) + { + normals.push_back(in_normals[3*i.vn_idx+0]); + normals.push_back(in_normals[3*i.vn_idx+1]); + normals.push_back(in_normals[3*i.vn_idx+2]); + } + + if (i.vt_idx >= 0) + { + texcoords.push_back(in_texcoords[2*i.vt_idx+0]); + texcoords.push_back(in_texcoords[2*i.vt_idx+1]); + } + + auto idx = positions.size() / 3 - 1; + vertexCache[i] = idx; + + return idx; +} + +static bool exportFaceGroupToShape( std::map& vertexCache, ObjLoader::shapes_t& shapes, const std::vector &in_positions, + const std::vector &in_normals, const std::vector &in_texcoords, const std::vector >& faceGroup, + const ObjLoader::material_t &material, const std::string &name) +{ + if (faceGroup.empty()) + { + return false; + } + + // Flattened version of vertex data + std::vector& positions = shapes.positions; + std::vector& normals = shapes.normals; + std::vector& texcoords = shapes.texcoords; + std::vector indices; + + // Flatten vertices and indices + for (size_t i = 0; i < faceGroup.size(); i++) + { + const std::vector& face = faceGroup[i]; + + vertex_index i0 = face[0]; + vertex_index i1(-1); + vertex_index i2 = face[1]; + + size_t npolys = face.size(); + + // Polygon -> triangle fan conversion + for (size_t k = 2; k < npolys; k++) + { + i1 = i2; + i2 = face[k]; + + unsigned short v0 = updateVertex(vertexCache, positions, normals, texcoords, in_positions, in_normals, in_texcoords, i0); + unsigned short v1 = updateVertex(vertexCache, positions, normals, texcoords, in_positions, in_normals, in_texcoords, i1); + unsigned short v2 = updateVertex(vertexCache, positions, normals, texcoords, in_positions, in_normals, in_texcoords, i2); + + indices.push_back(v0); + indices.push_back(v1); + indices.push_back(v2); + } + } + + ObjLoader::shape_t shape; + shape.name = name; + shape.material = material; + shape.mesh.indices.swap(indices); + + shapes.shapes.push_back(shape); + return true; + +} + +std::string trim(const std::string& str) +{ + if (str.empty()) + return str; + auto len = str.length(); + char c = str[len - 1]; + while (c == '\r' || c == '\n') + { + len--; + c = str[len - 1]; + } + return str.substr(0, len); +} + +void InitMaterial(ObjLoader::material_t& material) +{ + material.name = ""; + material.ambient_texname = ""; + material.diffuse_texname = ""; + material.specular_texname = ""; + material.normal_texname = ""; + for (int i = 0; i < 3; i ++) + { + material.ambient[i] = 0.f; + material.diffuse[i] = 0.f; + material.specular[i] = 0.f; + material.transmittance[i] = 0.f; + material.emission[i] = 0.f; + } + material.illum = 0; + material.dissolve = 1.f; + material.shininess = 1.f; + material.unknown_parameter.clear(); +} + +std::string LoadMtl ( std::map& material_map, const char* filename, const char* mtl_basepath) +{ + material_map.clear(); + std::stringstream err; + + std::string filepath; + + if (mtl_basepath) + { + filepath = std::string(mtl_basepath) + std::string(filename); + } + else + { + filepath = std::string(filename); + } + + std::ifstream ifs(filepath.c_str()); + if (!ifs) + { + err << "Cannot open file [" << filepath << "]" << std::endl; + return err.str(); + } + + ObjLoader::material_t material; + + int maxchars = 8192; // Alloc enough size. + std::vector buf(maxchars); // Alloc enough size. + while (ifs.peek() != -1) + { + ifs.getline(&buf[0], maxchars); + + std::string linebuf(&buf[0]); + + // Trim newline '\r\n' or '\r' + if (linebuf.size() > 0) + { + if (linebuf[linebuf.size()-1] == '\n') linebuf.erase(linebuf.size()-1); + } + if (linebuf.size() > 0) + { + if (linebuf[linebuf.size()-1] == '\n') linebuf.erase(linebuf.size()-1); + } + + // Skip if empty line. + if (linebuf.empty()) + { + continue; + } + + // Skip leading space. + const char* token = linebuf.c_str(); + token += strspn(token, " \t"); + + assert(token); + if (token[0] == '\0') continue; // empty line + + if (token[0] == '#') continue; // comment line + + // new mtl + if ((0 == strncmp(token, "newmtl", 6)) && isSpace((token[6]))) + { + // flush previous material. + material_map.insert(std::pair(material.name, material)); + + // initial temporary material + InitMaterial(material); + + // set new mtl name + char namebuf[4096]; + token += 7; + sscanf(token, "%s", namebuf); + material.name = namebuf; + continue; + } + + // ambient + if (token[0] == 'K' && token[1] == 'a' && isSpace((token[2]))) + { + token += 2; + float r, g, b; + parseFloat3(r, g, b, token); + material.ambient[0] = r; + material.ambient[1] = g; + material.ambient[2] = b; + continue; + } + + // diffuse + if (token[0] == 'K' && token[1] == 'd' && isSpace((token[2]))) + { + token += 2; + float r, g, b; + parseFloat3(r, g, b, token); + material.diffuse[0] = r; + material.diffuse[1] = g; + material.diffuse[2] = b; + continue; + } + + // specular + if (token[0] == 'K' && token[1] == 's' && isSpace((token[2]))) + { + token += 2; + float r, g, b; + parseFloat3(r, g, b, token); + material.specular[0] = r; + material.specular[1] = g; + material.specular[2] = b; + continue; + } + + // transmittance + if (token[0] == 'K' && token[1] == 't' && isSpace((token[2]))) + { + token += 2; + float r, g, b; + parseFloat3(r, g, b, token); + material.transmittance[0] = r; + material.transmittance[1] = g; + material.transmittance[2] = b; + continue; + } + + // ior(index of refraction) + if (token[0] == 'N' && token[1] == 'i' && isSpace((token[2]))) + { + token += 2; + material.ior = parseFloat(token); + continue; + } + + // emission + if(token[0] == 'K' && token[1] == 'e' && isSpace(token[2])) + { + token += 2; + float r, g, b; + parseFloat3(r, g, b, token); + material.emission[0] = r; + material.emission[1] = g; + material.emission[2] = b; + continue; + } + + // shininess + if(token[0] == 'N' && token[1] == 's' && isSpace(token[2])) + { + token += 2; + material.shininess = parseFloat(token); + continue; + } + + // illum model + if (0 == strncmp(token, "illum", 5) && isSpace(token[5])) + { + token += 6; + material.illum = parseInt(token); + continue; + } + + // dissolve + if ((token[0] == 'd' && isSpace(token[1]))) + { + token += 1; + material.dissolve = parseFloat(token); + continue; + } + if (token[0] == 'T' && token[1] == 'r' && isSpace(token[2])) + { + token += 2; + material.dissolve = parseFloat(token); + continue; + } + + // ambient texture + if ((0 == strncmp(token, "map_Ka", 6)) && isSpace(token[6])) + { + token += 7; + material.ambient_texname = trim(token); + continue; + } + + // diffuse texture + if ((0 == strncmp(token, "map_Kd", 6)) && isSpace(token[6])) + { + token += 7; + material.diffuse_texname = trim(token); + continue; + } + + // specular texture + if ((0 == strncmp(token, "map_Ks", 6)) && isSpace(token[6])) + { + token += 7; + material.specular_texname = trim(token); + continue; + } + + // normal texture + if ((0 == strncmp(token, "map_Ns", 6)) && isSpace(token[6])) + { + token += 7; + material.normal_texname = trim(token); + continue; + } + + // unknown parameter + const char* _space = strchr(token, ' '); + if(!_space) + { + _space = strchr(token, '\t'); + } + if(_space) + { + auto len = _space - token; + std::string key(token, len); + std::string value = _space + 1; + material.unknown_parameter.insert(std::pair(key, value)); + } + } + // flush last material. + material_map.insert(std::pair(material.name, material)); + return err.str(); +} + +std::string ObjLoader::LoadObj(shapes_t& shapes, const char* filename, const char* mtl_basepath) +{ + shapes.reset(); + + std::stringstream err; + std::istringstream ifs(FileUtils::getInstance()->getStringFromFile(filename)); + std::map vertexCache; + //std::ifstream ifs(filename); + + if (!ifs) + { + err << "Cannot open file [" << filename << "]" << std::endl; + return err.str(); + } + + std::vector v; + std::vector vn; + std::vector vt; + std::vector > faceGroup; + std::string name; + + // material + std::map material_map; + material_t material; + + int maxchars = 8192; // Alloc enough size. + std::vector buf(maxchars); // Alloc enough size. + while (ifs.peek() != -1) + { + ifs.getline(&buf[0], maxchars); + + std::string linebuf(&buf[0]); + + // Trim newline '\r\n' or '\r' + if (linebuf.size() > 0) + { + if (linebuf[linebuf.size()-1] == '\n') linebuf.erase(linebuf.size()-1); + } + if (linebuf.size() > 0) + { + if (linebuf[linebuf.size()-1] == '\n') linebuf.erase(linebuf.size()-1); + } + + // Skip if empty line. + if (linebuf.empty()) + { + continue; + } + + // Skip leading space. + const char* token = linebuf.c_str(); + token += strspn(token, " \t"); + + assert(token); + if (token[0] == '\0') continue; // empty line + + if (token[0] == '#') continue; // comment line + + // vertex + if (token[0] == 'v' && isSpace((token[1]))) + { + token += 2; + float x, y, z; + parseFloat3(x, y, z, token); + v.push_back(x); + v.push_back(y); + v.push_back(z); + continue; + } + + // normal + if (token[0] == 'v' && token[1] == 'n' && isSpace((token[2]))) + { + token += 3; + float x, y, z; + parseFloat3(x, y, z, token); + vn.push_back(x); + vn.push_back(y); + vn.push_back(z); + continue; + } + + // texcoord + if (token[0] == 'v' && token[1] == 't' && isSpace((token[2]))) + { + token += 3; + float x, y; + parseFloat2(x, y, token); + vt.push_back(x); + vt.push_back(y); + continue; + } + + // face + if (token[0] == 'f' && isSpace((token[1]))) + { + token += 2; + token += strspn(token, " \t"); + + std::vector face; + while (!isNewLine(token[0])) { + vertex_index vi = parseTriple(token, v.size() / 3, vn.size() / 3, vt.size() / 2); + face.push_back(vi); + auto n = strspn(token, " \t\r"); + token += n; + } + + faceGroup.push_back(face); + + continue; + } + + // use mtl + if ((0 == strncmp(token, "usemtl", 6)) && isSpace((token[6]))) + { + + char namebuf[4096]; + token += 7; + sscanf(token, "%s", namebuf); + + if (material_map.find(namebuf) != material_map.end()) + { + material = material_map[namebuf]; + } + else + { + // { error!! material not found } + InitMaterial(material); + } + continue; + + } + + // load mtl + if ((0 == strncmp(token, "mtllib", 6)) && isSpace((token[6]))) + { + char namebuf[4096]; + token += 7; + sscanf(token, "%s", namebuf); + + std::string err_mtl = LoadMtl(material_map, namebuf, mtl_basepath); + if (!err_mtl.empty()) + { + faceGroup.clear(); // for safety + //return err_mtl; + } + continue; + } + + // group name + if (token[0] == 'g' && isSpace((token[1]))) + { + // flush previous face group. + shape_t shape; + exportFaceGroupToShape(vertexCache, shapes, v, vn, vt, faceGroup, material, name); + + faceGroup.clear(); + + std::vector names; + while (!isNewLine(token[0])) + { + std::string str = parseString(token); + names.push_back(str); + token += strspn(token, " \t\r"); // skip tag + } + + assert(names.size() > 0); + + // names[0] must be 'g', so skipt 0th element. + if (names.size() > 1) + { + name = names[1]; + } + else + { + name = ""; + } + + continue; + } + + // object name + if (token[0] == 'o' && isSpace((token[1]))) + { + // flush previous face group. + shape_t shape; + exportFaceGroupToShape(vertexCache, shapes, v, vn, vt, faceGroup, material, name); + + faceGroup.clear(); + + // @todo { multiple object name? } + char namebuf[4096]; + token += 2; + sscanf(token, "%s", namebuf); + name = std::string(namebuf); + + continue; + } + + // Ignore unknown command. + } + + shape_t shape; + exportFaceGroupToShape(vertexCache, shapes, v, vn, vt, faceGroup, material, name); + faceGroup.clear(); // for safety + + return err.str(); +} + +NS_CC_END diff --git a/cocos/3d/CCObjLoader.h b/cocos/3d/CCObjLoader.h new file mode 100644 index 0000000000..a0ef97cb4d --- /dev/null +++ b/cocos/3d/CCObjLoader.h @@ -0,0 +1,87 @@ +// +// Copyright 2012-2013, Syoyo Fujita. +// +// Licensed under 2-clause BSD liecense. +// +// copied from Syoyo Fujita +// https://github.com/syoyo/tinyobjloader + +#ifndef __CCOBJLOADER_H__ +#define __CCOBJLOADER_H__ + +#include +#include +#include +#include "base/ccTypes.h" + +NS_CC_BEGIN + +class ObjLoader +{ +public: + typedef struct + { + std::string name; + + float ambient[3]; + float diffuse[3]; + float specular[3]; + float transmittance[3]; + float emission[3]; + float shininess; + float ior; // index of refraction + float dissolve; // 1 == opaque; 0 == fully transparent + // illumination model (see http://www.fileformat.info/format/material/) + int illum; + + std::string ambient_texname; + std::string diffuse_texname; + std::string specular_texname; + std::string normal_texname; + std::map unknown_parameter; + } material_t; + + typedef struct + { + std::vector indices; + } mesh_t; + + typedef struct + { + std::string name; + material_t material; + mesh_t mesh; + } shape_t; + + typedef struct + { + std::vector positions; + std::vector normals; + std::vector texcoords; + + std::vector shapes; + + void reset() + { + positions.clear(); + normals.clear(); + texcoords.clear(); + shapes.clear(); + } + }shapes_t; + + /// Loads .obj from a file. + /// 'shapes' will be filled with parsed shape data + /// The function returns error string. + /// Returns empty string when loading .obj success. + /// 'mtl_basepath' is optional, and used for base path for .mtl file. + static std::string LoadObj( + shapes_t& shapes, // [output] + const char* filename, + const char* mtl_basepath = NULL); + +}; + +NS_CC_END + +#endif // _TINY_OBJ_LOADER_H diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp new file mode 100644 index 0000000000..06d9b1be7e --- /dev/null +++ b/cocos/3d/CCSprite3D.cpp @@ -0,0 +1,271 @@ +/**************************************************************************** + 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 "3d/CCSprite3D.h" +#include "3d/CCSprite3DDataCache.h" +#include "3d/CCMesh.h" +#include "3d/CCObjLoader.h" + +#include "base/CCDirector.h" +#include "base/CCPlatformMacros.h" +#include "base/ccMacros.h" +#include "platform/CCFileUtils.h" +#include "renderer/CCTextureCache.h" +#include "renderer/CCRenderer.h" +#include "renderer/CCGLProgramState.h" +#include "renderer/CCGLProgramCache.h" + +#include "deprecated/CCString.h" // For StringUtils::format + +NS_CC_BEGIN + +std::string s_attributeNames[] = {GLProgram::ATTRIBUTE_NAME_POSITION, GLProgram::ATTRIBUTE_NAME_COLOR, GLProgram::ATTRIBUTE_NAME_TEX_COORD, GLProgram::ATTRIBUTE_NAME_NORMAL}; + +Sprite3D* Sprite3D::create(const std::string &modelPath) +{ + if (modelPath.length() < 4) + CCASSERT(false, "improper name specified when creating Sprite3D"); + + auto sprite = new Sprite3D(); + if (sprite && sprite->initWithFile(modelPath)) + { + sprite->autorelease(); + return sprite; + } + CC_SAFE_DELETE(sprite); + return nullptr; +} + +Sprite3D* Sprite3D::create(const std::string &modelPath, const std::string &texturePath) +{ + auto sprite = create(modelPath); + if (sprite) + { + sprite->setTexture(texturePath); + } + + return sprite; +} + +// Sprite3D* Sprite3D::create(Mesh* mesh, const std::string& texturePath) +// { +// CCASSERT(nullptr != mesh, "Could not create a Sprite3D from a null Mesh"); +// auto sprite = new Sprite3D(); +// if(sprite) +// { +// sprite->_mesh = mesh; +// sprite->_mesh->retain(); +// sprite->setTexture(texturePath); +// sprite->autorelease(); +// return sprite; +// } +// CC_SAFE_DELETE(sprite); +// return nullptr; +// } + +//.mtl file should at the same directory with the same name if exist +bool Sprite3D::loadFromObj(const std::string& path) +{ + std::string fullPath = FileUtils::getInstance()->fullPathForFilename(path); + + //.mtl file directory + std::string dir = ""; + auto last = fullPath.rfind("/"); + if (last != -1) + dir = fullPath.substr(0, last + 1); + + ObjLoader::shapes_t shapes; + std::string errstr = ObjLoader::LoadObj(shapes, fullPath.c_str(), dir.c_str()); + if (!errstr.empty()) + return false; + + //convert to mesh and material + std::vector indices; + std::vector matnames; + std::string texname; + for (auto it = shapes.shapes.begin(); it != shapes.shapes.end(); it++) + { + indices.insert(indices.end(), (*it).mesh.indices.begin(),(*it).mesh.indices.end()); + //indices.push_back((*it).mesh.indices); + if (texname.empty()) + texname = (*it).material.diffuse_texname; + else if (texname != (*it).material.diffuse_texname) + { + CCLOGWARN("cocos2d:WARNING: more than one texture in %s", path.c_str()); + } + + matnames.push_back(dir + (*it).material.diffuse_texname); + } + _mesh = Mesh::create(shapes.positions, shapes.normals, shapes.texcoords, indices); + + _mesh->retain(); + if (_mesh == nullptr) + return false; + + if (matnames.size()) + { + setTexture(matnames[0]); + } + genGLProgramState(); + + //add to cache + Sprite3DDataCache::getInstance()->addSprite3D(fullPath, _mesh, matnames.size() > 0 ? matnames[0] : ""); + + return true; +} + +Sprite3D::Sprite3D() +: _mesh(nullptr) +, _texture(nullptr) +, _blend(BlendFunc::ALPHA_NON_PREMULTIPLIED) +{ +} + +Sprite3D::~Sprite3D() +{ + CC_SAFE_RELEASE_NULL(_texture); + CC_SAFE_RELEASE_NULL(_mesh); +} + +bool Sprite3D::initWithFile(const std::string &path) +{ + CC_SAFE_RELEASE_NULL(_mesh); + + CC_SAFE_RELEASE_NULL(_texture); + + //find from the cache + Mesh* mesh = Sprite3DDataCache::getInstance()->getSprite3DMesh(path); + if (mesh) + { + _mesh = mesh; + _mesh->retain(); + + auto tex = Sprite3DDataCache::getInstance()->getSprite3DTexture(path); + setTexture(tex); + + genGLProgramState(); + + return true; + } + else + { + //load from file + std::string ext = path.substr(path.length() - 4, 4); + if (ext != ".obj" || !loadFromObj(path)) + { + return false; + } + return true; + } +} + +void Sprite3D::genGLProgramState() +{ + auto programstate = GLProgramState::getOrCreateWithGLProgram(getDefaultGLProgram(_mesh->hasVertexAttrib(GLProgram::VERTEX_ATTRIB_TEX_COORD))); + long offset = 0; + auto attributeCount = _mesh->getMeshVertexAttribCount(); + for (auto k = 0; k < attributeCount; k++) { + auto meshattribute = _mesh->getMeshVertexAttribute(k); + programstate->setVertexAttribPointer(s_attributeNames[meshattribute.vertexAttrib], + meshattribute.size, + meshattribute.type, + GL_FALSE, + _mesh->getVertexSizeInBytes(), + (GLvoid*)offset); + offset += meshattribute.attribSizeBytes; + } + + setGLProgramState(programstate); +} + +GLProgram* Sprite3D::getDefaultGLProgram(bool textured) +{ + if(textured) + { + return GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_3D_POSITION_TEXTURE); + } + else + { + return GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_3D_POSITION); + } +} + +void Sprite3D::setTexture(const std::string& texFile) +{ + auto tex = Director::getInstance()->getTextureCache()->addImage(texFile); + if( tex && _texture != tex ) { + CC_SAFE_RETAIN(tex); + CC_SAFE_RELEASE_NULL(_texture); + _texture = tex; + } +} + +void Sprite3D::setTexture(Texture2D* texture) +{ + if(_texture != texture) { + CC_SAFE_RETAIN(texture); + CC_SAFE_RELEASE_NULL(_texture); + _texture = texture; + } +} + +void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, bool transformUpdated) +{ + GLProgramState* programstate = getGLProgramState(); + Color4F color(getDisplayedColor()); + color.a = getDisplayedOpacity() / 255.0f; + + GLuint textureID = _texture ? _texture->getName() : 0; + _meshCommand.init(_globalZOrder, + textureID, + programstate, + _blend, + _mesh->getVertexBuffer(), + _mesh->getIndexBuffer(), + (GLenum)_mesh->getPrimitiveType(), + (GLenum)_mesh->getIndexFormat(), + _mesh->getIndexCount(), + transform); + + _meshCommand.setCullFaceEnabled(true); + _meshCommand.setDepthTestEnabled(true); + //support tint and fade + _meshCommand.setDisplayColor(Vec4(color.r, color.g, color.b, color.a)); + Director::getInstance()->getRenderer()->addCommand(&_meshCommand); +} + +void Sprite3D::setBlendFunc(const BlendFunc &blendFunc) +{ + if(_blend.src != blendFunc.src || _blend.dst != blendFunc.dst) + { + _blend = blendFunc; + } +} + +const BlendFunc& Sprite3D::getBlendFunc() const +{ + return _blend; +} + +NS_CC_END diff --git a/cocos/3d/CCSprite3D.h b/cocos/3d/CCSprite3D.h new file mode 100644 index 0000000000..3d6559f662 --- /dev/null +++ b/cocos/3d/CCSprite3D.h @@ -0,0 +1,85 @@ +/**************************************************************************** + 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 __CCSPRITE3D_H__ +#define __CCSPRITE3D_H__ + +#include + +#include "base/CCVector.h" +#include "base/ccTypes.h" +#include "base/CCProtocols.h" +#include "2d/CCNode.h" +#include "renderer/CCMeshCommand.h" + +NS_CC_BEGIN + +class GLProgramState; +class Mesh; +class Texture2D; + +/** Sprite3D: TODO add description */ +class Sprite3D : public Node, public BlendProtocol +{ +public: + /// creates a Sprite3D + static Sprite3D* create(const std::string &modelPath); + + // creates a Sprite3D. It only supports one texture, and overrides the internal texture with 'texturePath' + static Sprite3D* create(const std::string &modelPath, const std::string &texturePath); + + //set texture + void setTexture(const std::string& texFile); + void setTexture(Texture2D* texture); + + Mesh* getMesh() const { return _mesh; } + + // overrides + virtual void setBlendFunc(const BlendFunc &blendFunc) override; + virtual const BlendFunc &getBlendFunc() const override; + +protected: + Sprite3D(); + virtual ~Sprite3D(); + bool initWithFile(const std::string &path); + + //.mtl file should at the same directory with the same name if exist + bool loadFromObj(const std::string& path); + + virtual void draw(Renderer *renderer, const Mat4 &transform, bool transformUpdated) override; + + virtual GLProgram* getDefaultGLProgram(bool textured = true); + + void genGLProgramState(); + + Mesh *_mesh; + MeshCommand _meshCommand; + Texture2D* _texture; + BlendFunc _blend; +}; + +extern std::string s_attributeNames[]; + +NS_CC_END +#endif // __SPRITE3D_H_ diff --git a/cocos/3d/CCSprite3DDataCache.cpp b/cocos/3d/CCSprite3DDataCache.cpp new file mode 100644 index 0000000000..3b5748b49f --- /dev/null +++ b/cocos/3d/CCSprite3DDataCache.cpp @@ -0,0 +1,145 @@ +/**************************************************************************** + 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 "3d/CCSprite3DDataCache.h" + +#include "3d/CCMesh.h" +#include "platform/CCFileUtils.h" +#include "renderer/CCTextureCache.h" +#include "base/CCEventCustom.h" +#include "base/CCEventListenerCustom.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventType.h" +#include "base/CCDirector.h" + +NS_CC_BEGIN + +Sprite3DDataCache* Sprite3DDataCache::_cacheInstance = nullptr; + +Sprite3DDataCache::Sprite3DDataCache() +{ + #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + // listen the event when app go to foreground + _backToForegroundlistener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, CC_CALLBACK_1(Sprite3DDataCache::listenBackToForeground, this)); + Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundlistener, -1); + #endif +} + +Sprite3DDataCache::~Sprite3DDataCache() +{ + removeAllSprite3DData(); + #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + Director::getInstance()->getEventDispatcher()->removeEventListener(_backToForegroundlistener); + #endif +} + +Sprite3DDataCache* Sprite3DDataCache::getInstance() +{ + if (! _cacheInstance) + { + _cacheInstance = new Sprite3DDataCache(); + } + + return _cacheInstance; +} + +void Sprite3DDataCache::purgeMeshCache() +{ + if (_cacheInstance) + { + CC_SAFE_DELETE(_cacheInstance); + } +} + +bool Sprite3DDataCache::addSprite3D(const std::string& fileName, Mesh* mesh, const std::string& texture) +{ + const std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName); + auto itr = _sprite3DDatas.find(fullPath); + if (itr == _sprite3DDatas.end()) + { + Sprite3DData data; + data.mesh = mesh; + CC_SAFE_RETAIN(mesh); + data.texture = texture; + _sprite3DDatas[fullPath] = data; + return true; + } + return false; +} + +Mesh* Sprite3DDataCache::getSprite3DMesh(const std::string& fileName) +{ + const std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName); + auto itr = _sprite3DDatas.find(fullPath); + if (itr != _sprite3DDatas.end()) + return itr->second.mesh; + return nullptr; +} + +Texture2D* Sprite3DDataCache::getSprite3DTexture(const std::string& fileName) +{ + const std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName); + auto itr = _sprite3DDatas.find(fullPath); + if (itr != _sprite3DDatas.end()) + { + auto cache = Director::getInstance()->getTextureCache(); + return cache->addImage(itr->second.texture); + } + return nullptr; +} + +void Sprite3DDataCache::removeAllSprite3DData() +{ + for (auto itr = _sprite3DDatas.begin(); itr != _sprite3DDatas.end(); itr++) { + CC_SAFE_RELEASE_NULL(itr->second.mesh); + } + _sprite3DDatas.clear(); +} +void Sprite3DDataCache::removeUnusedSprite3DData() +{ + for( auto it=_sprite3DDatas.cbegin(); it!=_sprite3DDatas.cend(); /* nothing */) { + auto value = it->second; + if( value.mesh->getReferenceCount() == 1 ) { + CCLOG("cocos2d: GLProgramStateCache: removing unused GLProgramState"); + + value.mesh->release(); + _sprite3DDatas.erase(it++); + } else { + ++it; + } + } +} + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +void Sprite3DDataCache::listenBackToForeground(EventCustom* event) +{ + for (auto iter = _sprite3DDatas.begin(); iter != _sprite3DDatas.end(); ++iter) + { + auto mesh = iter->second.mesh; + mesh->restore(); + } +} +#endif + +NS_CC_END diff --git a/cocos/3d/CCSprite3DDataCache.h b/cocos/3d/CCSprite3DDataCache.h new file mode 100644 index 0000000000..f6e80fb489 --- /dev/null +++ b/cocos/3d/CCSprite3DDataCache.h @@ -0,0 +1,83 @@ +/**************************************************************************** + 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 __CCSPRIT3DDATA_CACHE_H__ +#define __CCSPRIT3DDATA_CACHE_H__ + +#include +#include +#include "base/ccTypes.h" +#include "base/CCMap.h" + +NS_CC_BEGIN + +class Sprite3D; +class Mesh; +class EventListenerCustom; +class EventCustom; +class Texture2D; + +class Sprite3DDataCache +{ +public: + struct Sprite3DData + { + Mesh* mesh; + std::string texture; + }; + + static Sprite3DDataCache* getInstance(); + static void purgeMeshCache(); + + bool addSprite3D(const std::string& fileName, Mesh* mesh, const std::string& texture); + + Mesh* getSprite3DMesh(const std::string& fileName); + + Texture2D* getSprite3DTexture(const std::string& fileName); + + void removeAllSprite3DData(); + void removeUnusedSprite3DData(); + + + #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + void listenBackToForeground(EventCustom* event); + #endif + +protected: + Sprite3DDataCache(); + + ~Sprite3DDataCache(); + + static Sprite3DDataCache* _cacheInstance; + + std::unordered_map _sprite3DDatas; //sprites + + #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + EventListenerCustom* _backToForegroundlistener; + #endif +}; + +NS_CC_END + +#endif // __CCSPRIT3DDATA_CACHE_H__ diff --git a/cocos/3d/CMakeLists.txt b/cocos/3d/CMakeLists.txt new file mode 100644 index 0000000000..cb7d6a9de3 --- /dev/null +++ b/cocos/3d/CMakeLists.txt @@ -0,0 +1,7 @@ +set(COCOS_3D_SRC + 3d/CCMesh.cpp + 3d/CCObjLoader.cpp + 3d/CCSprite3D.cpp + 3d/CCSprite3DDataCache.cpp +) + diff --git a/cocos/Android.mk b/cocos/Android.mk index 297a26e97a..70603cfd6a 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -12,8 +12,8 @@ cocos2d.cpp \ 2d/CCActionCamera.cpp \ 2d/CCActionCatmullRom.cpp \ 2d/CCActionEase.cpp \ -2d/CCActionGrid3D.cpp \ 2d/CCActionGrid.cpp \ +2d/CCActionGrid3D.cpp \ 2d/CCActionInstant.cpp \ 2d/CCActionInterval.cpp \ 2d/CCActionManager.cpp \ @@ -21,30 +21,28 @@ cocos2d.cpp \ 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/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 \ @@ -59,45 +57,39 @@ cocos2d.cpp \ 2d/CCProgressTimer.cpp \ 2d/CCRenderTexture.cpp \ 2d/CCScene.cpp \ -2d/CCScriptSupport.cpp \ -2d/CCSpriteBatchNode.cpp \ 2d/CCSprite.cpp \ -2d/CCSpriteFrameCache.cpp \ +2d/CCSpriteBatchNode.cpp \ 2d/CCSpriteFrame.cpp \ -2d/CCTextFieldTTF.cpp \ -2d/CCTexture2D.cpp \ -2d/CCTextureAtlas.cpp \ -2d/CCTextureCache.cpp \ -2d/CCTileMapAtlas.cpp \ +2d/CCSpriteFrameCache.cpp \ 2d/CCTMXLayer.cpp \ 2d/CCTMXObjectGroup.cpp \ 2d/CCTMXTiledMap.cpp \ 2d/CCTMXXMLParser.cpp \ +2d/CCTextFieldTTF.cpp \ +2d/CCTileMapAtlas.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/CCVertex.cpp \ -2d/TGAlib.cpp \ -2d/ccFPSImages.c \ -2d/platform/CCGLViewProtocol.cpp \ -2d/platform/CCFileUtils.cpp \ -2d/platform/CCSAXParser.cpp \ -2d/platform/CCThread.cpp \ -2d/platform/CCImage.cpp \ +3d/CCMesh.cpp \ +3d/CCSprite3DDataCache.cpp \ +3d/CCObjLoader.cpp \ +3d/CCSprite3D.cpp \ +platform/CCGLViewProtocol.cpp \ +platform/CCFileUtils.cpp \ +platform/CCSAXParser.cpp \ +platform/CCThread.cpp \ +platform/CCImage.cpp \ math/CCAffineTransform.cpp \ math/CCGeometry.cpp \ +math/CCVertex.cpp \ +math/Mat4.cpp \ math/MathUtil.cpp \ -math/Matrix.cpp \ math/Quaternion.cpp \ math/TransformUtils.cpp \ -math/Vector2.cpp \ -math/Vector3.cpp \ -math/Vector4.cpp \ +math/Vec2.cpp \ +math/Vec3.cpp \ +math/Vec4.cpp \ base/CCAutoreleasePool.cpp \ base/CCConfiguration.cpp \ base/CCConsole.cpp \ @@ -108,40 +100,53 @@ base/CCEvent.cpp \ base/CCEventAcceleration.cpp \ base/CCEventCustom.cpp \ base/CCEventDispatcher.cpp \ +base/CCEventFocus.cpp \ base/CCEventKeyboard.cpp \ base/CCEventListener.cpp \ base/CCEventListenerAcceleration.cpp \ base/CCEventListenerCustom.cpp \ +base/CCEventListenerFocus.cpp \ base/CCEventListenerKeyboard.cpp \ base/CCEventListenerMouse.cpp \ base/CCEventListenerTouch.cpp \ base/CCEventMouse.cpp \ base/CCEventTouch.cpp \ -base/CCEventFocus.cpp \ -base/CCEventListenerFocus.cpp \ +base/CCIMEDispatcher.cpp \ base/CCNS.cpp \ base/CCProfiling.cpp \ base/CCRef.cpp \ base/CCScheduler.cpp \ +base/CCScriptSupport.cpp \ base/CCTouch.cpp \ +base/CCUserDefault.cpp \ +base/CCUserDefaultAndroid.cpp \ base/CCValue.cpp \ +base/TGAlib.cpp \ base/ZipUtils.cpp \ base/atitc.cpp \ base/base64.cpp \ +base/ccCArray.cpp \ +base/ccFPSImages.c \ base/ccTypes.cpp \ +base/ccUTF8.cpp \ +base/ccUtils.cpp \ base/etc1.cpp \ base/s3tc.cpp \ renderer/CCBatchCommand.cpp \ renderer/CCCustomCommand.cpp \ renderer/CCGLProgram.cpp \ +renderer/CCGLProgramCache.cpp \ renderer/CCGLProgramState.cpp \ renderer/CCGLProgramStateCache.cpp \ -renderer/ccGLStateCache.cpp \ renderer/CCGroupCommand.cpp \ renderer/CCQuadCommand.cpp \ +renderer/CCMeshCommand.cpp \ renderer/CCRenderCommand.cpp \ renderer/CCRenderer.cpp \ -renderer/CCGLProgramCache.cpp \ +renderer/CCTexture2D.cpp \ +renderer/CCTextureAtlas.cpp \ +renderer/CCTextureCache.cpp \ +renderer/ccGLStateCache.cpp \ renderer/ccShaders.cpp \ deprecated/CCArray.cpp \ deprecated/CCSet.cpp \ @@ -170,8 +175,7 @@ physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/. \ - $(LOCAL_PATH)/2d \ - $(LOCAL_PATH)/2d/platform/android \ + $(LOCAL_PATH)/platform/android \ $(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/unzip \ $(LOCAL_PATH)/../external/chipmunk/include/chipmunk \ @@ -179,7 +183,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/. \ - $(LOCAL_PATH)/2d/platform/android \ + $(LOCAL_PATH)/platform/android \ $(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/unzip \ $(LOCAL_PATH)/../external/chipmunk/include/chipmunk \ @@ -212,4 +216,4 @@ include $(BUILD_STATIC_LIBRARY) $(call import-module,freetype2/prebuilt/android) $(call import-module,chipmunk) -$(call import-module,2d/platform/android) +$(call import-module,platform/android) diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt index ecc42fc558..1479931bc8 100644 --- a/cocos/CMakeLists.txt +++ b/cocos/CMakeLists.txt @@ -8,6 +8,8 @@ set(COCOS_SRC ) include(2d/CMakeLists.txt) +include(3d/CMakeLists.txt) +include(platform/CMakeLists.txt) include(physics/CMakeLists.txt) include(math/CMakeLists.txt) include(renderer/CMakeLists.txt) @@ -20,7 +22,8 @@ include(storage/CMakeLists.txt) add_library(cocos2d STATIC ${COCOS_SRC} ${COCOS_2D_SRC} - ${COCOS_2D_PLATFORM_SRC} + ${COCOS_3D_SRC} + ${COCOS_PLATFORM_SRC} ${COCOS_BASE_SRC} ${COCOS_RENDERER_SRC} ${COCOS_MATH_SRC} diff --git a/cocos/audio/android/Android.mk b/cocos/audio/android/Android.mk index 3da9a20b15..e5f3261840 100644 --- a/cocos/audio/android/Android.mk +++ b/cocos/audio/android/Android.mk @@ -13,11 +13,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../math \ - $(LOCAL_PATH)/../../2d \ - $(LOCAL_PATH)/../../2d/platform/android \ - $(LOCAL_PATH)/../../base \ - $(LOCAL_PATH)/../../physics + $(LOCAL_PATH)/../../platform/android LOCAL_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi diff --git a/cocos/base/CCConfiguration.cpp b/cocos/base/CCConfiguration.cpp index 4490e975e0..c5b8bd61f1 100644 --- a/cocos/base/CCConfiguration.cpp +++ b/cocos/base/CCConfiguration.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include #include "base/ccMacros.h" #include "base/ccConfig.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 7f95c2e595..1eaf59e458 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -59,8 +59,8 @@ #include "base/CCPlatformConfig.h" #include "base/CCConfiguration.h" #include "2d/CCScene.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/CCTextureCache.h" +#include "platform/CCFileUtils.h" +#include "renderer/CCTextureCache.h" #include "CCGLView.h" #include "base/base64.h" NS_CC_BEGIN diff --git a/cocos/base/CCData.cpp b/cocos/base/CCData.cpp index 9cff6809e8..fda70d44b7 100644 --- a/cocos/base/CCData.cpp +++ b/cocos/base/CCData.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "base/CCData.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/ccMacros.h" #include diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index a70ccabbc7..791482c1b8 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -31,23 +31,24 @@ THE SOFTWARE. // standard includes #include -#include "2d/ccFPSImages.h" #include "2d/CCDrawingPrimitives.h" #include "2d/CCScene.h" #include "2d/CCSpriteFrameCache.h" -#include "2d/platform/CCFileUtils.h" -#include "renderer/ccGLStateCache.h" -#include "2d/platform/CCImage.h" +#include "platform/CCFileUtils.h" +#include "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/CCTransition.h" +#include "2d/CCFontFreeType.h" #include "renderer/CCGLProgramCache.h" #include "renderer/CCGLProgramStateCache.h" -#include "2d/CCTransition.h" -#include "2d/CCTextureCache.h" -#include "2d/CCFontFreeType.h" +#include "renderer/CCTextureCache.h" +#include "renderer/ccGLStateCache.h" +#include "renderer/CCRenderer.h" +#include "base/CCUserDefault.h" +#include "base/ccFPSImages.h" #include "base/CCScheduler.h" #include "base/ccMacros.h" #include "base/CCEventDispatcher.h" @@ -57,7 +58,6 @@ THE SOFTWARE. #include "base/CCAutoreleasePool.h" #include "base/CCProfiling.h" #include "base/CCConfiguration.h" -#include "renderer/CCRenderer.h" #include "base/CCNS.h" #include "math/CCMath.h" #include "CCApplication.h" @@ -887,6 +887,13 @@ void Director::popToSceneStackLevel(int level) if (level >= c) return; + auto fisrtOnStackScene = _scenesStack.back(); + if (fisrtOnStackScene == _runningScene) + { + _scenesStack.popBack(); + --c; + } + // pop stack until reaching desired level while (c > level) { @@ -903,7 +910,9 @@ void Director::popToSceneStackLevel(int level) } _nextScene = _scenesStack.back(); - _sendCleanupToScene = false; + + // cleanup running scene + _sendCleanupToScene = true; } void Director::end() diff --git a/cocos/base/CCEventDispatcher.cpp b/cocos/base/CCEventDispatcher.cpp index 8eff6c0581..5ee33beaa5 100644 --- a/cocos/base/CCEventDispatcher.cpp +++ b/cocos/base/CCEventDispatcher.cpp @@ -292,6 +292,14 @@ void EventDispatcher::pauseEventListenersForTarget(Node* target, bool recursive/ l->setPaused(true); } } + + for (auto& listener : _toAddedListeners) + { + if (listener->getAssociatedNode() == target) + { + listener->setPaused(true); + } + } if (recursive) { @@ -314,6 +322,15 @@ void EventDispatcher::resumeEventListenersForTarget(Node* target, bool recursive l->setPaused(false); } } + + for (auto& listener : _toAddedListeners) + { + if (listener->getAssociatedNode() == target) + { + listener->setPaused(false); + } + } + setDirtyForNode(target); if (recursive) diff --git a/cocos/base/CCEventListener.cpp b/cocos/base/CCEventListener.cpp index 2c0985b6fd..c6f6acaccd 100644 --- a/cocos/base/CCEventListener.cpp +++ b/cocos/base/CCEventListener.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "base/CCEventListener.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" NS_CC_BEGIN diff --git a/cocos/2d/CCIMEDelegate.h b/cocos/base/CCIMEDelegate.h similarity index 100% rename from cocos/2d/CCIMEDelegate.h rename to cocos/base/CCIMEDelegate.h diff --git a/cocos/2d/CCIMEDispatcher.cpp b/cocos/base/CCIMEDispatcher.cpp similarity index 99% rename from cocos/2d/CCIMEDispatcher.cpp rename to cocos/base/CCIMEDispatcher.cpp index 589d2f8189..c5b59c0110 100644 --- a/cocos/2d/CCIMEDispatcher.cpp +++ b/cocos/base/CCIMEDispatcher.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/CCIMEDispatcher.h" +#include "base/CCIMEDispatcher.h" #include diff --git a/cocos/2d/CCIMEDispatcher.h b/cocos/base/CCIMEDispatcher.h similarity index 99% rename from cocos/2d/CCIMEDispatcher.h rename to cocos/base/CCIMEDispatcher.h index 6b6a4b1fc7..09b212bff4 100644 --- a/cocos/2d/CCIMEDispatcher.h +++ b/cocos/base/CCIMEDispatcher.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_IME_DISPATCHER_H__ #define __CC_IME_DISPATCHER_H__ -#include "2d/CCIMEDelegate.h" +#include "base/CCIMEDelegate.h" NS_CC_BEGIN diff --git a/cocos/base/CCPlatformConfig.h b/cocos/base/CCPlatformConfig.h index f9e5e698a3..12c1735256 100644 --- a/cocos/base/CCPlatformConfig.h +++ b/cocos/base/CCPlatformConfig.h @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_PLATFORM_CONFIG_H__ -#define __CC_PLATFORM_CONFIG_H__ +#ifndef __BASE_CC_PLATFORM_CONFIG_H__ +#define __BASE_CC_PLATFORM_CONFIG_H__ /** Config of cocos2d-x project, per target platform. @@ -154,5 +154,5 @@ Config of cocos2d-x project, per target platform. #endif #endif // CC_PLATFORM_WIN32 -#endif // __CC_PLATFORM_CONFIG_H__ +#endif // __BASE_CC_PLATFORM_CONFIG_H__ diff --git a/cocos/2d/CCProtocols.h b/cocos/base/CCProtocols.h similarity index 98% rename from cocos/2d/CCProtocols.h rename to cocos/base/CCProtocols.h index 13535409df..b12daa781f 100644 --- a/cocos/2d/CCProtocols.h +++ b/cocos/base/CCProtocols.h @@ -24,12 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCPROTOCOLS_H__ -#define __CCPROTOCOLS_H__ +#ifndef __BASE_CCPROTOCOLS_H__ +#define __BASE_CCPROTOCOLS_H__ + +#include #include "base/ccTypes.h" -#include "2d/CCTexture2D.h" -#include +#include "renderer/CCTexture2D.h" NS_CC_BEGIN @@ -267,4 +268,4 @@ public: NS_CC_END -#endif // __CCPROTOCOLS_H__ +#endif // __BASE_CCPROTOCOLS_H__ diff --git a/cocos/base/CCRef.cpp b/cocos/base/CCRef.cpp index 9163a32409..1f2c3a4ce7 100644 --- a/cocos/base/CCRef.cpp +++ b/cocos/base/CCRef.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/CCAutoreleasePool.h" #include "base/ccMacros.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #if CC_USE_MEM_LEAK_DETECTION #include // std::find diff --git a/cocos/base/CCRef.h b/cocos/base/CCRef.h index e418d3d659..50f8c8b05c 100644 --- a/cocos/base/CCRef.h +++ b/cocos/base/CCRef.h @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCREF_H__ -#define __CCREF_H__ +#ifndef __BASE_CCREF_H__ +#define __BASE_CCREF_H__ #include "base/CCPlatformMacros.h" #include "base/ccConfig.h" @@ -172,4 +172,4 @@ typedef void (Ref::*SEL_SCHEDULE)(float); NS_CC_END -#endif // __CCREF_H__ +#endif // __BASE_CCREF_H__ diff --git a/cocos/base/CCScheduler.cpp b/cocos/base/CCScheduler.cpp index 08a6cb6186..3688f74a3c 100644 --- a/cocos/base/CCScheduler.cpp +++ b/cocos/base/CCScheduler.cpp @@ -28,9 +28,9 @@ THE SOFTWARE. #include "base/CCScheduler.h" #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "2d/utlist.h" -#include "2d/ccCArray.h" -#include "2d/CCScriptSupport.h" +#include "base/utlist.h" +#include "base/ccCArray.h" +#include "base/CCScriptSupport.h" NS_CC_BEGIN diff --git a/cocos/base/CCScheduler.h b/cocos/base/CCScheduler.h index 7c7a0a5d6b..51f352770a 100644 --- a/cocos/base/CCScheduler.h +++ b/cocos/base/CCScheduler.h @@ -34,7 +34,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/CCVector.h" -#include "2d/uthash.h" +#include "base/uthash.h" NS_CC_BEGIN diff --git a/cocos/2d/CCScriptSupport.cpp b/cocos/base/CCScriptSupport.cpp similarity index 99% rename from cocos/2d/CCScriptSupport.cpp rename to cocos/base/CCScriptSupport.cpp index 0bf83ef912..f5400c436a 100644 --- a/cocos/2d/CCScriptSupport.cpp +++ b/cocos/base/CCScriptSupport.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #if CC_ENABLE_SCRIPT_BINDING diff --git a/cocos/2d/CCScriptSupport.h b/cocos/base/CCScriptSupport.h similarity index 99% rename from cocos/2d/CCScriptSupport.h rename to cocos/base/CCScriptSupport.h index 8bf06a0dcb..ee649a1f9a 100644 --- a/cocos/2d/CCScriptSupport.h +++ b/cocos/base/CCScriptSupport.h @@ -29,7 +29,7 @@ #include "base/ccConfig.h" #if CC_ENABLE_SCRIPT_BINDING -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/CCTouch.h" #include "base/CCEventTouch.h" #include "base/CCEventKeyboard.h" diff --git a/cocos/2d/CCUserDefault.cpp b/cocos/base/CCUserDefault.cpp similarity index 99% rename from cocos/2d/CCUserDefault.cpp rename to cocos/base/CCUserDefault.cpp index 7344507f7c..884e383171 100644 --- a/cocos/2d/CCUserDefault.cpp +++ b/cocos/base/CCUserDefault.cpp @@ -22,9 +22,9 @@ 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/CCUserDefault.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCFileUtils.h" +#include "base/CCUserDefault.h" +#include "platform/CCCommon.h" +#include "platform/CCFileUtils.h" #include "tinyxml2.h" #include "base/base64.h" diff --git a/cocos/2d/CCUserDefault.h b/cocos/base/CCUserDefault.h similarity index 100% rename from cocos/2d/CCUserDefault.h rename to cocos/base/CCUserDefault.h diff --git a/cocos/2d/CCUserDefault.mm b/cocos/base/CCUserDefault.mm similarity index 100% rename from cocos/2d/CCUserDefault.mm rename to cocos/base/CCUserDefault.mm diff --git a/cocos/2d/CCUserDefaultAndroid.cpp b/cocos/base/CCUserDefaultAndroid.cpp similarity index 98% rename from cocos/2d/CCUserDefaultAndroid.cpp rename to cocos/base/CCUserDefaultAndroid.cpp index f24a6a8010..fb96d39e37 100644 --- a/cocos/2d/CCUserDefaultAndroid.cpp +++ b/cocos/base/CCUserDefaultAndroid.cpp @@ -22,13 +22,13 @@ 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/CCUserDefault.h" +#include "base/CCUserDefault.h" #include "base/CCPlatformConfig.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/base64.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" +#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" // root name of xml #define USERDEFAULT_ROOT_NAME "userDefaultRoot" @@ -38,7 +38,7 @@ THE SOFTWARE. #define XML_FILE_NAME "UserDefault.xml" #ifdef KEEP_COMPATABILITY -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "../tinyxml2/tinyxml2.h" #endif diff --git a/cocos/base/CMakeLists.txt b/cocos/base/CMakeLists.txt index 2c7faeb78f..0b628db4ac 100644 --- a/cocos/base/CMakeLists.txt +++ b/cocos/base/CMakeLists.txt @@ -1,36 +1,44 @@ set(COCOS_BASE_SRC - base/atitc.cpp - base/base64.cpp base/CCAutoreleasePool.cpp base/CCConfiguration.cpp base/CCConsole.cpp base/CCData.cpp base/CCDataVisitor.cpp base/CCDirector.cpp - base/CCEventAcceleration.cpp base/CCEvent.cpp + base/CCEventAcceleration.cpp base/CCEventCustom.cpp base/CCEventDispatcher.cpp + base/CCEventFocus.cpp base/CCEventKeyboard.cpp - base/CCEventListenerAcceleration.cpp base/CCEventListener.cpp + base/CCEventListenerAcceleration.cpp base/CCEventListenerCustom.cpp + base/CCEventListenerFocus.cpp base/CCEventListenerKeyboard.cpp base/CCEventListenerMouse.cpp base/CCEventListenerTouch.cpp base/CCEventMouse.cpp base/CCEventTouch.cpp - base/CCEventFocus.cpp - base/CCEventListenerFocus.cpp + base/CCIMEDispatcher.cpp base/CCNS.cpp base/CCProfiling.cpp base/CCRef.cpp base/CCScheduler.cpp + base/CCScriptSupport.cpp base/CCTouch.cpp - base/ccTypes.cpp + base/CCUserDefault.cpp + base/CCUserDefaultAndroid.cpp base/CCValue.cpp + base/TGAlib.cpp + base/ZipUtils.cpp + base/atitc.cpp + base/base64.cpp + base/ccCArray.cpp + base/ccFPSImages.c + base/ccTypes.cpp + base/ccUTF8.cpp + base/ccUtils.cpp base/etc1.cpp base/s3tc.cpp - base/ZipUtils.cpp ) - diff --git a/cocos/2d/TGAlib.cpp b/cocos/base/TGAlib.cpp similarity index 99% rename from cocos/2d/TGAlib.cpp rename to cocos/base/TGAlib.cpp index abcd90ebb3..5c097f6c46 100644 --- a/cocos/2d/TGAlib.cpp +++ b/cocos/base/TGAlib.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "TGAlib.h" #include "base/CCData.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/TGAlib.h b/cocos/base/TGAlib.h similarity index 100% rename from cocos/2d/TGAlib.h rename to cocos/base/TGAlib.h diff --git a/cocos/base/ZipUtils.cpp b/cocos/base/ZipUtils.cpp index ffe6b5941c..c5f7e26011 100644 --- a/cocos/base/ZipUtils.cpp +++ b/cocos/base/ZipUtils.cpp @@ -29,7 +29,7 @@ #include "base/ZipUtils.h" #include "base/CCData.h" #include "base/ccMacros.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "unzip.h" #include diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h index 9df427e943..d6b1e20c9a 100644 --- a/cocos/base/ZipUtils.h +++ b/cocos/base/ZipUtils.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "base/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "2d/platform/android/CCFileUtilsAndroid.h" +#include "platform/android/CCFileUtilsAndroid.h" #elif(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) // for import ssize_t on win32 platform #include "CCStdC.h" diff --git a/cocos/2d/ccCArray.cpp b/cocos/base/ccCArray.cpp similarity index 99% rename from cocos/2d/ccCArray.cpp rename to cocos/base/ccCArray.cpp index 78e7c2cfc7..a9a463e624 100644 --- a/cocos/2d/ccCArray.cpp +++ b/cocos/base/ccCArray.cpp @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/ccCArray.h" +#include "base/ccCArray.h" #include "base/CCRef.h" #include "base/ccTypes.h" diff --git a/cocos/2d/ccCArray.h b/cocos/base/ccCArray.h similarity index 100% rename from cocos/2d/ccCArray.h rename to cocos/base/ccCArray.h diff --git a/cocos/2d/ccFPSImages.c b/cocos/base/ccFPSImages.c similarity index 99% rename from cocos/2d/ccFPSImages.c rename to cocos/base/ccFPSImages.c index 7beb7309e3..725491f9b1 100644 --- a/cocos/2d/ccFPSImages.c +++ b/cocos/base/ccFPSImages.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "ccFPSImages.h" +#include "base/ccFPSImages.h" unsigned char cc_fps_images_png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, diff --git a/cocos/2d/ccFPSImages.h b/cocos/base/ccFPSImages.h similarity index 93% rename from cocos/2d/ccFPSImages.h rename to cocos/base/ccFPSImages.h index ad9f012692..02fd5a83dd 100644 --- a/cocos/2d/ccFPSImages.h +++ b/cocos/base/ccFPSImages.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef __CCFPSIMAGES__H -#define __CCFPSIMAGES__H +#ifndef __BASE_CCFPSIMAGES__H +#define __BASE_CCFPSIMAGES__H #ifdef __cplusplus extern "C" { @@ -36,4 +36,4 @@ unsigned int cc_fps_images_len(void); } #endif -#endif // __CCFPSIMAGES__H +#endif // __BASE_CCFPSIMAGES__H diff --git a/cocos/base/ccMacros.h b/cocos/base/ccMacros.h index 476a1e0de7..165dbab7cf 100644 --- a/cocos/base/ccMacros.h +++ b/cocos/base/ccMacros.h @@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCMACROS_H__ -#define __CCMACROS_H__ +#ifndef __BASE_CCMACROS_H__ +#define __BASE_CCMACROS_H__ #ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES @@ -276,4 +276,4 @@ It should work same as apples CFSwapInt32LittleToHost(..) #define CC_CALLBACK_2(__selector__,__target__, ...) std::bind(&__selector__,__target__, std::placeholders::_1, std::placeholders::_2, ##__VA_ARGS__) #define CC_CALLBACK_3(__selector__,__target__, ...) std::bind(&__selector__,__target__, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, ##__VA_ARGS__) -#endif // __CCMACROS_H__ +#endif // __BASE_CCMACROS_H__ diff --git a/cocos/base/ccTypes.h b/cocos/base/ccTypes.h index 3b884d55a8..f447c4de5b 100644 --- a/cocos/base/ccTypes.h +++ b/cocos/base/ccTypes.h @@ -25,10 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCTYPES_H__ -#define __CCTYPES_H__ +#ifndef __BASE_CCTYPES_H__ +#define __BASE_CCTYPES_H__ #include + #include "math/CCGeometry.h" #include "math/CCMath.h" #include "CCGL.h" @@ -478,4 +479,4 @@ extern const ssize_t CC_INVALID_INDEX; NS_CC_END -#endif //__CCTYPES_H__ +#endif //__BASE_CCTYPES_H__ diff --git a/cocos/2d/ccUTF8.cpp b/cocos/base/ccUTF8.cpp similarity index 99% rename from cocos/2d/ccUTF8.cpp rename to cocos/base/ccUTF8.cpp index b3a68da20a..fd9514f4c9 100644 --- a/cocos/2d/ccUTF8.cpp +++ b/cocos/base/ccUTF8.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "ccUTF8.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/CCConsole.h" #include "ConvertUTF.h" diff --git a/cocos/2d/ccUTF8.h b/cocos/base/ccUTF8.h similarity index 100% rename from cocos/2d/ccUTF8.h rename to cocos/base/ccUTF8.h diff --git a/cocos/2d/ccUtils.cpp b/cocos/base/ccUtils.cpp similarity index 98% rename from cocos/2d/ccUtils.cpp rename to cocos/base/ccUtils.cpp index 456cb573a3..55182df253 100644 --- a/cocos/2d/ccUtils.cpp +++ b/cocos/base/ccUtils.cpp @@ -22,7 +22,8 @@ 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/ccUtils.h" + +#include "base/ccUtils.h" namespace cocos2d { diff --git a/cocos/2d/ccUtils.h b/cocos/base/ccUtils.h similarity index 100% rename from cocos/2d/ccUtils.h rename to cocos/base/ccUtils.h diff --git a/cocos/2d/firePngData.h b/cocos/base/firePngData.h similarity index 100% rename from cocos/2d/firePngData.h rename to cocos/base/firePngData.h diff --git a/cocos/2d/uthash.h b/cocos/base/uthash.h similarity index 100% rename from cocos/2d/uthash.h rename to cocos/base/uthash.h diff --git a/cocos/2d/utlist.h b/cocos/base/utlist.h similarity index 100% rename from cocos/2d/utlist.h rename to cocos/base/utlist.h diff --git a/cocos/2d/cocos2dx-Prefix.pch b/cocos/cocos2d-prefix.pch similarity index 100% rename from cocos/2d/cocos2dx-Prefix.pch rename to cocos/cocos2d-prefix.pch diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 143678e877..41b3a0a89f 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -56,8 +56,13 @@ THE SOFTWARE. #include "base/ZipUtils.h" #include "base/CCProfiling.h" #include "base/CCConsole.h" +#include "base/ccUTF8.h" +#include "base/CCUserDefault.h" +#include "base/CCIMEDelegate.h" +#include "base/CCIMEDispatcher.h" // EventDispatcher +#include "base/CCEventType.h" #include "base/CCEventDispatcher.h" #include "base/CCEventListenerTouch.h" #include "base/CCEventTouch.h" @@ -75,12 +80,13 @@ THE SOFTWARE. // math #include "math/CCAffineTransform.h" #include "math/CCGeometry.h" -#include "math/Vector2.h" -#include "math/Vector3.h" -#include "math/Vector4.h" -#include "math/Matrix.h" +#include "math/Vec2.h" +#include "math/Vec3.h" +#include "math/Vec4.h" +#include "math/Mat4.h" #include "math/Quaternion.h" #include "math/MathUtil.h" +#include "math/CCVertex.h" // actions #include "2d/CCAction.h" @@ -130,10 +136,9 @@ THE SOFTWARE. #include "2d/CCGrid.h" // include -#include "base/CCEventType.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" -// new renderer +// renderer #include "renderer/CCCustomCommand.h" #include "renderer/CCGroupCommand.h" #include "renderer/CCQuadCommand.h" @@ -145,6 +150,8 @@ THE SOFTWARE. #include "renderer/CCGLProgramState.h" #include "renderer/ccGLStateCache.h" #include "renderer/ccShaders.h" +#include "renderer/CCTexture2D.h" +#include "renderer/CCTextureCache.h" // physics #include "physics/CCPhysicsBody.h" @@ -154,75 +161,75 @@ THE SOFTWARE. #include "physics/CCPhysicsWorld.h" // platform -#include "2d/platform/CCDevice.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/platform/CCImage.h" -#include "2d/platform/CCSAXParser.h" -#include "2d/platform/CCThread.h" +#include "platform/CCDevice.h" +#include "platform/CCCommon.h" +#include "platform/CCFileUtils.h" +#include "platform/CCImage.h" +#include "platform/CCSAXParser.h" +#include "platform/CCThread.h" #include "base/CCPlatformConfig.h" #include "base/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - #include "2d/platform/ios/CCApplication.h" - #include "2d/platform/ios/CCGLView.h" - #include "2d/platform/ios/CCGL.h" - #include "2d/platform/ios/CCStdC.h" + #include "platform/ios/CCApplication.h" + #include "platform/ios/CCGLView.h" + #include "platform/ios/CCGL.h" + #include "platform/ios/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - #include "2d/platform/android/CCApplication.h" - #include "2d/platform/android/CCGLView.h" - #include "2d/platform/android/CCGL.h" - #include "2d/platform/android/CCStdC.h" + #include "platform/android/CCApplication.h" + #include "platform/android/CCGLView.h" + #include "platform/android/CCGL.h" + #include "platform/android/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) - #include "2d/platform/blackberry/CCApplication.h" - #include "2d/platform/blackberry/CCGLView.h" - #include "2d/platform/blackberry/CCGL.h" - #include "2d/platform/blackberry/CCStdC.h" + #include "platform/blackberry/CCApplication.h" + #include "platform/blackberry/CCGLView.h" + #include "platform/blackberry/CCGL.h" + #include "platform/blackberry/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) - #include "2d/platform/win32/CCApplication.h" - #include "2d/platform/desktop/CCGLView.h" - #include "2d/platform/win32/CCGL.h" - #include "2d/platform/win32/CCStdC.h" + #include "platform/win32/CCApplication.h" + #include "platform/desktop/CCGLView.h" + #include "platform/win32/CCGL.h" + #include "platform/win32/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) - #include "2d/platform/mac/CCApplication.h" - #include "2d/platform/desktop/CCGLView.h" - #include "2d/platform/mac/CCGL.h" - #include "2d/platform/mac/CCStdC.h" + #include "platform/mac/CCApplication.h" + #include "platform/desktop/CCGLView.h" + #include "platform/mac/CCGL.h" + #include "platform/mac/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) - #include "2d/platform/linux/CCApplication.h" - #include "2d/platform/desktop/CCGLView.h" - #include "2d/platform/linux/CCGL.h" - #include "2d/platform/linux/CCStdC.h" + #include "platform/linux/CCApplication.h" + #include "platform/desktop/CCGLView.h" + #include "platform/linux/CCGL.h" + #include "platform/linux/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) - #include "2d/platform/winrt/CCApplication.h" - #include "2d/platform/winrt/CCGLView.h" - #include "2d/platform/winrt/CCGL.h" - #include "2d/platform/winrt/CCStdC.h" - #include "2d/platform/winrt/CCPrecompiledShaders.h" + #include "platform/winrt/CCApplication.h" + #include "platform/winrt/CCGLView.h" + #include "platform/winrt/CCGL.h" + #include "platform/winrt/CCStdC.h" + #include "platform/winrt/CCPrecompiledShaders.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) - #include "2d/platform/winrt/CCApplication.h" - #include "2d/platform/wp8/CCGLView.h" - #include "2d/platform/winrt/CCGL.h" - #include "2d/platform/winrt/CCStdC.h" - #include "2d/platform/winrt/CCPrecompiledShaders.h" + #include "platform/winrt/CCApplication.h" + #include "platform/wp8/CCGLView.h" + #include "platform/winrt/CCGL.h" + #include "platform/winrt/CCStdC.h" + #include "platform/winrt/CCPrecompiledShaders.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WP8 // script_support -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" // sprite_nodes #include "2d/CCAnimation.h" @@ -232,20 +239,11 @@ THE SOFTWARE. #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -// support -#include "2d/ccUTF8.h" -#include "2d/CCUserDefault.h" -#include "2d/CCVertex.h" - // text_input_node -#include "2d/CCIMEDelegate.h" -#include "2d/CCIMEDispatcher.h" #include "2d/CCTextFieldTTF.h" // textures -#include "2d/CCTexture2D.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" // tilemap_parallax_nodes #include "2d/CCParallaxNode.h" @@ -259,6 +257,10 @@ THE SOFTWARE. #include "2d/CCComponent.h" #include "2d/CCComponentContainer.h" +//3d +#include "3d/CCSprite3D.h" +#include "3d/CCMesh.h" + // Audio #include "audio/include/SimpleAudioEngine.h" diff --git a/cocos/deprecated/CCArray.cpp b/cocos/deprecated/CCArray.cpp index a3778e19fc..80118faa74 100644 --- a/cocos/deprecated/CCArray.cpp +++ b/cocos/deprecated/CCArray.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCArray.h" #include "deprecated/CCString.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCArray.h b/cocos/deprecated/CCArray.h index a6361e1b80..c06bd5e6b0 100644 --- a/cocos/deprecated/CCArray.h +++ b/cocos/deprecated/CCArray.h @@ -34,7 +34,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/ccMacros.h" #else -#include "2d/ccCArray.h" +#include "base/ccCArray.h" #endif #include "base/CCDataVisitor.h" diff --git a/cocos/deprecated/CCDeprecated.h b/cocos/deprecated/CCDeprecated.h index e8b154e6b5..685a47fc4b 100644 --- a/cocos/deprecated/CCDeprecated.h +++ b/cocos/deprecated/CCDeprecated.h @@ -771,7 +771,6 @@ CC_DEPRECATED_ATTRIBUTE typedef GLView CCEGLView; CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent; CC_DEPRECATED_ATTRIBUTE typedef AffineTransform CCAffineTransform; CC_DEPRECATED_ATTRIBUTE typedef Vec2 CCPoint; -CC_DEPRECATED_ATTRIBUTE typedef Vec2 Point; CC_DEPRECATED_ATTRIBUTE typedef Size CCSize; CC_DEPRECATED_ATTRIBUTE typedef Rect CCRect; CC_DEPRECATED_ATTRIBUTE typedef Color3B ccColor3B; diff --git a/cocos/deprecated/CCDictionary.cpp b/cocos/deprecated/CCDictionary.cpp index 7552d9285b..96ae7dcc7a 100644 --- a/cocos/deprecated/CCDictionary.cpp +++ b/cocos/deprecated/CCDictionary.cpp @@ -26,7 +26,7 @@ #include "CCDictionary.h" #include "deprecated/CCString.h" #include "CCInteger.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "deprecated/CCString.h" #include "CCBool.h" #include "CCInteger.h" diff --git a/cocos/deprecated/CCDictionary.h b/cocos/deprecated/CCDictionary.h index 1993a81d56..5bd701c10a 100644 --- a/cocos/deprecated/CCDictionary.h +++ b/cocos/deprecated/CCDictionary.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCDICTIONARY_H__ #define __CCDICTIONARY_H__ -#include "2d/uthash.h" +#include "base/uthash.h" #include "base/CCRef.h" #include "CCArray.h" #include "deprecated/CCString.h" diff --git a/cocos/deprecated/CCInteger.h b/cocos/deprecated/CCInteger.h index c78d5eba74..c3710eaf49 100644 --- a/cocos/deprecated/CCInteger.h +++ b/cocos/deprecated/CCInteger.h @@ -27,7 +27,7 @@ #include "base/CCRef.h" #include "base/CCDataVisitor.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCNotificationCenter.cpp b/cocos/deprecated/CCNotificationCenter.cpp index 837ac6f8dc..7fec442329 100644 --- a/cocos/deprecated/CCNotificationCenter.cpp +++ b/cocos/deprecated/CCNotificationCenter.cpp @@ -24,11 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCNotificationCenter.h" -#include "deprecated/CCArray.h" -#include "2d/CCScriptSupport.h" +#include "deprecated/CCNotificationCenter.h" + #include +#include "base/CCScriptSupport.h" +#include "deprecated/CCArray.h" + using namespace std; NS_CC_BEGIN diff --git a/cocos/deprecated/CCString.cpp b/cocos/deprecated/CCString.cpp index 311c250bc0..8492573d70 100644 --- a/cocos/deprecated/CCString.cpp +++ b/cocos/deprecated/CCString.cpp @@ -24,7 +24,7 @@ Copyright (c) 2013-2014 Chukong Technologies ****************************************************************************/ #include "deprecated/CCString.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/ccMacros.h" #include #include diff --git a/cocos/editor-support/cocosbuilder/CCBReader.cpp b/cocos/editor-support/cocosbuilder/CCBReader.cpp index a224629a71..60bb3119fd 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.cpp +++ b/cocos/editor-support/cocosbuilder/CCBReader.cpp @@ -2,10 +2,10 @@ #include #include "base/CCDirector.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "2d/CCScene.h" -#include "2d/CCTextureCache.h" #include "2d/CCSpriteFrameCache.h" +#include "renderer/CCTextureCache.h" #include "CCBReader.h" #include "CCNodeLoader.h" diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index a2ab0aecf7..cea37b4e63 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp index deeca68471..94a35ca249 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -291,6 +291,7 @@ void FrameData::copy(const BaseData *baseData) } blendFunc = frameData->blendFunc; + isTween = frameData->isTween; } } diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.cpp b/cocos/editor-support/cocostudio/CCInputDelegate.cpp index 6f1dc7a5ed..7bc3d50526 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.cpp +++ b/cocos/editor-support/cocostudio/CCInputDelegate.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "cocostudio/CCInputDelegate.h" #include "base/CCDirector.h" -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include "base/CCEventListenerTouch.h" #include "base/CCEventListenerAcceleration.h" #include "base/CCEventListenerKeyboard.h" diff --git a/cocos/editor-support/spine/CCSkeleton.h b/cocos/editor-support/spine/CCSkeleton.h index 3b44e667df..dbcde2fb2c 100644 --- a/cocos/editor-support/spine/CCSkeleton.h +++ b/cocos/editor-support/spine/CCSkeleton.h @@ -37,8 +37,8 @@ #include #include "2d/CCNode.h" -#include "2d/CCProtocols.h" -#include "2d/CCTextureAtlas.h" +#include "base/CCProtocols.h" +#include "renderer/CCTextureAtlas.h" #include "renderer/CCCustomCommand.h" namespace spine { diff --git a/cocos/math/CCMath.h b/cocos/math/CCMath.h index e5f1daa130..7ea6798945 100644 --- a/cocos/math/CCMath.h +++ b/cocos/math/CCMath.h @@ -1,10 +1,10 @@ #ifndef __CC_MATH_H__ #define __CC_MATH_H__ -#include "Vector2.h" -#include "Vector3.h" -#include "Vector4.h" -#include "Matrix.h" +#include "Vec2.h" +#include "Vec3.h" +#include "Vec4.h" +#include "Mat4.h" #include "Quaternion.h" #endif \ No newline at end of file diff --git a/cocos/2d/CCVertex.cpp b/cocos/math/CCVertex.cpp similarity index 99% rename from cocos/2d/CCVertex.cpp rename to cocos/math/CCVertex.cpp index 8a96b2c2ee..5a9673d0db 100644 --- a/cocos/2d/CCVertex.cpp +++ b/cocos/math/CCVertex.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "2d/CCVertex.h" +#include "math/CCVertex.h" #include "base/ccMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/CCVertex.h b/cocos/math/CCVertex.h similarity index 100% rename from cocos/2d/CCVertex.h rename to cocos/math/CCVertex.h diff --git a/cocos/math/CMakeLists.txt b/cocos/math/CMakeLists.txt index df76392225..e7f2a0012b 100644 --- a/cocos/math/CMakeLists.txt +++ b/cocos/math/CMakeLists.txt @@ -1,12 +1,13 @@ set(COCOS_MATH_SRC - math/CCAffineTransform.cpp - math/CCGeometry.cpp - math/MathUtil.cpp - math/Matrix.cpp - math/Quaternion.cpp - math/TransformUtils.cpp - math/Vector2.cpp - math/Vector3.cpp - math/Vector4.cpp + math/CCAffineTransform.cpp + math/CCGeometry.cpp + math/CCVertex.cpp + math/Mat4.cpp + math/MathUtil.cpp + math/Quaternion.cpp + math/TransformUtils.cpp + math/Vec2.cpp + math/Vec3.cpp + math/Vec4.cpp ) diff --git a/cocos/math/Matrix.cpp b/cocos/math/Mat4.cpp similarity index 99% rename from cocos/math/Matrix.cpp rename to cocos/math/Mat4.cpp index c904b758f4..cd6217f1ad 100644 --- a/cocos/math/Matrix.cpp +++ b/cocos/math/Mat4.cpp @@ -18,9 +18,9 @@ This file was modified to fit the cocos2d-x project */ -#include "Matrix.h" -#include "Quaternion.h" -#include "MathUtil.h" +#include "math/Mat4.h" +#include "math/Quaternion.h" +#include "math/MathUtil.h" #include "base/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Matrix.h b/cocos/math/Mat4.h similarity index 99% rename from cocos/math/Matrix.h rename to cocos/math/Mat4.h index 1513599f53..077e5c0882 100644 --- a/cocos/math/Matrix.h +++ b/cocos/math/Mat4.h @@ -21,8 +21,8 @@ #ifndef MATH_MAT4_H #define MATH_MAT4_H -#include "math/Vector3.h" -#include "math/Vector4.h" +#include "math/Vec3.h" +#include "math/Vec4.h" NS_CC_MATH_BEGIN @@ -980,6 +980,6 @@ inline const Vec4 operator*(const Mat4& m, const Vec4& v); NS_CC_MATH_END -#include "Matrix.inl" +#include "math/Mat4.inl" #endif // MATH_MAT4_H diff --git a/cocos/math/Matrix.inl b/cocos/math/Mat4.inl similarity index 98% rename from cocos/math/Matrix.inl rename to cocos/math/Mat4.inl index 3ae3fc8c2d..ca01271d7c 100644 --- a/cocos/math/Matrix.inl +++ b/cocos/math/Mat4.inl @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "Matrix.h" +#include "math/Mat4.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Quaternion.h b/cocos/math/Quaternion.h index 73a7163807..bd8bc47db3 100644 --- a/cocos/math/Quaternion.h +++ b/cocos/math/Quaternion.h @@ -21,8 +21,8 @@ #ifndef QUATERNION_H_ #define QUATERNION_H_ -#include "Vector3.h" -#include "Matrix.h" +#include "math/Vec3.h" +#include "math/Mat4.h" //#include "Plane.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector2.cpp b/cocos/math/Vec2.cpp similarity index 98% rename from cocos/math/Vector2.cpp rename to cocos/math/Vec2.cpp index 0b0df415cd..c12a8e5ad3 100644 --- a/cocos/math/Vector2.cpp +++ b/cocos/math/Vec2.cpp @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "math/Vector2.h" +#include "math/Vec2.h" #include "math/MathUtil.h" #include "base/ccMacros.h" @@ -27,10 +27,10 @@ NS_CC_MATH_BEGIN // returns true if segment A-B intersects with segment C-D. S->E is the ovderlap part bool isOneDimensionSegmentOverlap(float A, float B, float C, float D, float *S, float * E) { - float ABmin = MIN(A, B); - float ABmax = MAX(A, B); - float CDmin = MIN(C, D); - float CDmax = MAX(C, D); + float ABmin = std::min(A, B); + float ABmax = std::max(A, B); + float CDmin = std::min(C, D); + float CDmax = std::max(C, D); if (ABmax < CDmin || CDmax < ABmin) { diff --git a/cocos/math/Vector2.h b/cocos/math/Vec2.h similarity index 99% rename from cocos/math/Vector2.h rename to cocos/math/Vec2.h index 0b5d9cb9c7..85a93e5815 100644 --- a/cocos/math/Vector2.h +++ b/cocos/math/Vec2.h @@ -743,10 +743,10 @@ public: */ inline const Vec2 operator*(float x, const Vec2& v); -typedef Vec2 Point2; +typedef Vec2 Point; NS_CC_MATH_END -#include "Vector2.inl" +#include "Vec2.inl" #endif // MATH_VEC2_H diff --git a/cocos/math/Vector2.inl b/cocos/math/Vec2.inl similarity index 98% rename from cocos/math/Vector2.inl rename to cocos/math/Vec2.inl index 9108765efc..329208b1e5 100644 --- a/cocos/math/Vector2.inl +++ b/cocos/math/Vec2.inl @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector2.h" +#include "math/Vec2.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector3.cpp b/cocos/math/Vec3.cpp similarity index 99% rename from cocos/math/Vector3.cpp rename to cocos/math/Vec3.cpp index 766aa822e3..63955842c0 100644 --- a/cocos/math/Vector3.cpp +++ b/cocos/math/Vec3.cpp @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector3.h" -#include "MathUtil.h" +#include "math/Vec3.h" +#include "math/MathUtil.h" #include "base/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector3.h b/cocos/math/Vec3.h similarity index 99% rename from cocos/math/Vector3.h rename to cocos/math/Vec3.h index 2ebfa8fd88..165af010f3 100644 --- a/cocos/math/Vector3.h +++ b/cocos/math/Vec3.h @@ -467,10 +467,10 @@ public: */ inline const Vec3 operator*(float x, const Vec3& v); -typedef Vec3 Point3; +//typedef Vec3 Point3; NS_CC_MATH_END -#include "Vector3.inl" +#include "Vec3.inl" #endif // MATH_VEC3_H diff --git a/cocos/math/Vector3.inl b/cocos/math/Vec3.inl similarity index 97% rename from cocos/math/Vector3.inl rename to cocos/math/Vec3.inl index 8bd30d61c0..2bfbc74d8d 100644 --- a/cocos/math/Vector3.inl +++ b/cocos/math/Vec3.inl @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector3.h" -#include "Matrix.h" +#include "math/Vec3.h" +#include "math/Mat4.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector4.cpp b/cocos/math/Vec4.cpp similarity index 99% rename from cocos/math/Vector4.cpp rename to cocos/math/Vec4.cpp index 3c8f8223c1..c78281300b 100644 --- a/cocos/math/Vector4.cpp +++ b/cocos/math/Vec4.cpp @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector4.h" -#include "MathUtil.h" +#include "math/Vec4.h" +#include "math/MathUtil.h" #include "base/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector4.h b/cocos/math/Vec4.h similarity index 99% rename from cocos/math/Vector4.h rename to cocos/math/Vec4.h index ce12686b92..2523978ce4 100644 --- a/cocos/math/Vector4.h +++ b/cocos/math/Vec4.h @@ -446,6 +446,6 @@ inline const Vec4 operator*(float x, const Vec4& v); NS_CC_MATH_END -#include "Vector4.inl" +#include "math/Vec4.inl" #endif // MATH_VEC4_H diff --git a/cocos/math/Vector4.inl b/cocos/math/Vec4.inl similarity index 97% rename from cocos/math/Vector4.inl rename to cocos/math/Vec4.inl index 9bdd7a9920..d69aee16f1 100644 --- a/cocos/math/Vector4.inl +++ b/cocos/math/Vec4.inl @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Matrix.h" -#include "Vector4.h" +#include "math/Mat4.h" +#include "math/Vec4.h" NS_CC_MATH_BEGIN diff --git a/cocos/network/HttpClient.cpp b/cocos/network/HttpClient.cpp index da18c9f2b9..2af83c8dee 100644 --- a/cocos/network/HttpClient.cpp +++ b/cocos/network/HttpClient.cpp @@ -38,7 +38,7 @@ #include "curl/curl.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCApplicationProtocol.h b/cocos/platform/CCApplicationProtocol.h similarity index 100% rename from cocos/2d/platform/CCApplicationProtocol.h rename to cocos/platform/CCApplicationProtocol.h diff --git a/cocos/2d/platform/CCCommon.h b/cocos/platform/CCCommon.h similarity index 100% rename from cocos/2d/platform/CCCommon.h rename to cocos/platform/CCCommon.h diff --git a/cocos/2d/platform/CCDevice.h b/cocos/platform/CCDevice.h similarity index 100% rename from cocos/2d/platform/CCDevice.h rename to cocos/platform/CCDevice.h diff --git a/cocos/2d/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp similarity index 99% rename from cocos/2d/platform/CCFileUtils.cpp rename to cocos/platform/CCFileUtils.cpp index e615f70e21..af4a22ab26 100644 --- a/cocos/2d/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -24,13 +24,17 @@ THE SOFTWARE. ****************************************************************************/ #include "CCFileUtils.h" + +#include + #include "base/CCData.h" #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "CCSAXParser.h" +#include "platform/CCSAXParser.h" + #include "tinyxml2.h" #include "unzip.h" -#include + using namespace std; diff --git a/cocos/2d/platform/CCFileUtils.h b/cocos/platform/CCFileUtils.h similarity index 100% rename from cocos/2d/platform/CCFileUtils.h rename to cocos/platform/CCFileUtils.h index 567f17249c..60e899ed35 100644 --- a/cocos/2d/platform/CCFileUtils.h +++ b/cocos/platform/CCFileUtils.h @@ -25,15 +25,15 @@ THE SOFTWARE. #ifndef __CC_FILEUTILS_H__ #define __CC_FILEUTILS_H__ +#include +#include +#include + #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include "base/CCValue.h" #include "base/CCData.h" -#include -#include -#include - NS_CC_BEGIN /** diff --git a/cocos/2d/platform/CCGLViewProtocol.cpp b/cocos/platform/CCGLViewProtocol.cpp similarity index 99% rename from cocos/2d/platform/CCGLViewProtocol.cpp rename to cocos/platform/CCGLViewProtocol.cpp index ffd2632bce..d2f821ac8b 100644 --- a/cocos/2d/platform/CCGLViewProtocol.cpp +++ b/cocos/platform/CCGLViewProtocol.cpp @@ -23,7 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLViewProtocol.h" +#include "platform/CCGLViewProtocol.h" + #include "base/CCTouch.h" #include "base/CCDirector.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/2d/platform/CCGLViewProtocol.h b/cocos/platform/CCGLViewProtocol.h similarity index 100% rename from cocos/2d/platform/CCGLViewProtocol.h rename to cocos/platform/CCGLViewProtocol.h diff --git a/cocos/2d/platform/CCImage.cpp b/cocos/platform/CCImage.cpp similarity index 99% rename from cocos/2d/platform/CCImage.cpp rename to cocos/platform/CCImage.cpp index 254ab5b880..193fe50d53 100644 --- a/cocos/2d/platform/CCImage.cpp +++ b/cocos/platform/CCImage.cpp @@ -24,12 +24,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCImage.h" -#include "base/CCData.h" +#include "platform/CCImage.h" #include #include +#include "base/CCData.h" + + #ifdef EMSCRIPTEN #include #include @@ -44,7 +46,7 @@ extern "C" } #include "base/s3tc.h" #include "base/atitc.h" -#include "2d/TGAlib.h" +#include "base/TGAlib.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) #include "decode.h" @@ -55,7 +57,7 @@ extern "C" #include "CCStdC.h" #include "CCFileUtils.h" #include "base/CCConfiguration.h" -#include "2d/ccUtils.h" +#include "base/ccUtils.h" #include "base/ZipUtils.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "android/CCFileUtilsAndroid.h" diff --git a/cocos/2d/platform/CCImage.h b/cocos/platform/CCImage.h similarity index 99% rename from cocos/2d/platform/CCImage.h rename to cocos/platform/CCImage.h index 000beace1a..6762204b05 100644 --- a/cocos/2d/platform/CCImage.h +++ b/cocos/platform/CCImage.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CC_IMAGE_H__ #include "base/CCRef.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" // premultiply alpha, or the effect will wrong when want to use other pixel format in Texture2D, // such as RGB888, RGB5A1 diff --git a/cocos/2d/platform/CCSAXParser.cpp b/cocos/platform/CCSAXParser.cpp similarity index 98% rename from cocos/2d/platform/CCSAXParser.cpp rename to cocos/platform/CCSAXParser.cpp index 75dd1c0415..e9c0acf702 100644 --- a/cocos/2d/platform/CCSAXParser.cpp +++ b/cocos/platform/CCSAXParser.cpp @@ -22,12 +22,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCSAXParser.h" -#include "CCFileUtils.h" -#include "tinyxml2.h" +#include "platform/CCSAXParser.h" #include // because its based on windows 8 build :P +#include "platform/CCFileUtils.h" +#include "tinyxml2.h" + + NS_CC_BEGIN class XmlSaxHander : public tinyxml2::XMLVisitor diff --git a/cocos/2d/platform/CCSAXParser.h b/cocos/platform/CCSAXParser.h similarity index 98% rename from cocos/2d/platform/CCSAXParser.h rename to cocos/platform/CCSAXParser.h index 2564bb0a40..601e87d831 100644 --- a/cocos/2d/platform/CCSAXParser.h +++ b/cocos/platform/CCSAXParser.h @@ -25,7 +25,7 @@ #define __CCSAXPARSER_H__ #include "base/CCPlatformConfig.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/CCThread.cpp b/cocos/platform/CCThread.cpp similarity index 98% rename from cocos/2d/platform/CCThread.cpp rename to cocos/platform/CCThread.cpp index b3e9e96c39..08c9588b7f 100644 --- a/cocos/2d/platform/CCThread.cpp +++ b/cocos/platform/CCThread.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCThread.h" +#include "platform/CCThread.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCThread.h b/cocos/platform/CCThread.h similarity index 98% rename from cocos/2d/platform/CCThread.h rename to cocos/platform/CCThread.h index 8783b82413..f2c6453f9f 100644 --- a/cocos/2d/platform/CCThread.h +++ b/cocos/platform/CCThread.h @@ -29,7 +29,8 @@ THE SOFTWARE. #include #include #include -#include "2d/platform/CCCommon.h" + +#include "platform/CCCommon.h" #include "base/CCPlatformMacros.h" #include "base/CCDirector.h" diff --git a/cocos/platform/CMakeLists.txt b/cocos/platform/CMakeLists.txt new file mode 100644 index 0000000000..c3ab0850e5 --- /dev/null +++ b/cocos/platform/CMakeLists.txt @@ -0,0 +1,43 @@ +if(WIN32) + +ADD_DEFINITIONS(-DUNICODE -D_UNICODE) + +set(COCOS_PLATFORM_SPECIFIC_SRC + platform/win32/CCStdC.cpp + platform/win32/CCFileUtilsWin32.cpp + platform/win32/CCCommon.cpp + platform/win32/CCApplication.cpp + platform/win32/CCDevice.cpp +) + +elseif(APPLE) + +else() + +set(COCOS_PLATFORM_SPECIFIC_SRC + platform/linux/CCStdC.cpp + platform/linux/CCFileUtilsLinux.cpp + platform/linux/CCCommon.cpp + platform/linux/CCApplication.cpp + platform/linux/CCDevice.cpp +) + +endif() + +include_directories( + ../external/ConvertUTF +) + +set(COCOS_PLATFORM_SRC + platform/CCSAXParser.cpp + platform/CCThread.cpp + platform/CCGLViewProtocol.cpp + platform/CCFileUtils.cpp + platform/CCImage.cpp + platform/desktop/CCGLView.cpp + ../external/edtaa3func/edtaa3func.cpp + ../external/ConvertUTF/ConvertUTFWrapper.cpp + ../external/ConvertUTF/ConvertUTF.c + ${COCOS_PLATFORM_SPECIFIC_SRC} +) + diff --git a/cocos/2d/platform/android/Android.mk b/cocos/platform/android/Android.mk similarity index 84% rename from cocos/2d/platform/android/Android.mk rename to cocos/platform/android/Android.mk index ee3a4c6ccb..1c35aa7dfc 100644 --- a/cocos/2d/platform/android/Android.mk +++ b/cocos/platform/android/Android.mk @@ -25,12 +25,8 @@ jni/TouchesJni.cpp LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_C_INCLUDES := $(LOCAL_PATH) \ + $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../../../base \ - $(LOCAL_PATH)/../../../math \ - $(LOCAL_PATH)/../../../physics \ - $(LOCAL_PATH)/../../../renderer LOCAL_LDLIBS := -lGLESv1_CM \ -lGLESv2 \ diff --git a/cocos/2d/platform/android/CCApplication.cpp b/cocos/platform/android/CCApplication.cpp similarity index 100% rename from cocos/2d/platform/android/CCApplication.cpp rename to cocos/platform/android/CCApplication.cpp diff --git a/cocos/2d/platform/android/CCApplication.h b/cocos/platform/android/CCApplication.h similarity index 97% rename from cocos/2d/platform/android/CCApplication.h rename to cocos/platform/android/CCApplication.h index 226a006fce..9a921d7b75 100644 --- a/cocos/2d/platform/android/CCApplication.h +++ b/cocos/platform/android/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCCommon.cpp b/cocos/platform/android/CCCommon.cpp similarity index 98% rename from cocos/2d/platform/android/CCCommon.cpp rename to cocos/platform/android/CCCommon.cpp index c8a96de0fd..0692077c21 100644 --- a/cocos/2d/platform/android/CCCommon.cpp +++ b/cocos/platform/android/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include #include diff --git a/cocos/2d/platform/android/CCDevice.cpp b/cocos/platform/android/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/android/CCDevice.cpp rename to cocos/platform/android/CCDevice.cpp index 2a4cca9c5f..fc5a0902f8 100644 --- a/cocos/2d/platform/android/CCDevice.cpp +++ b/cocos/platform/android/CCDevice.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include #include #include @@ -34,7 +34,7 @@ THE SOFTWARE. #include "jni/DPIJni.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "jni/JniHelper.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCFileUtilsAndroid.cpp b/cocos/platform/android/CCFileUtilsAndroid.cpp similarity index 99% rename from cocos/2d/platform/android/CCFileUtilsAndroid.cpp rename to cocos/platform/android/CCFileUtilsAndroid.cpp index 700e721922..e4ff00dec6 100644 --- a/cocos/2d/platform/android/CCFileUtilsAndroid.cpp +++ b/cocos/platform/android/CCFileUtilsAndroid.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #include "CCFileUtilsAndroid.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "android/asset_manager.h" #include "android/asset_manager_jni.h" diff --git a/cocos/2d/platform/android/CCFileUtilsAndroid.h b/cocos/platform/android/CCFileUtilsAndroid.h similarity index 98% rename from cocos/2d/platform/android/CCFileUtilsAndroid.h rename to cocos/platform/android/CCFileUtilsAndroid.h index cad3d13a29..9639c0daed 100644 --- a/cocos/2d/platform/android/CCFileUtilsAndroid.h +++ b/cocos/platform/android/CCFileUtilsAndroid.h @@ -28,7 +28,7 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include diff --git a/cocos/2d/platform/android/CCGL.h b/cocos/platform/android/CCGL.h similarity index 100% rename from cocos/2d/platform/android/CCGL.h rename to cocos/platform/android/CCGL.h diff --git a/cocos/2d/platform/android/CCGLView.cpp b/cocos/platform/android/CCGLView.cpp similarity index 100% rename from cocos/2d/platform/android/CCGLView.cpp rename to cocos/platform/android/CCGLView.cpp diff --git a/cocos/2d/platform/android/CCGLView.h b/cocos/platform/android/CCGLView.h similarity index 98% rename from cocos/2d/platform/android/CCGLView.h rename to cocos/platform/android/CCGLView.h index d8ea2b93de..6423d7019d 100644 --- a/cocos/2d/platform/android/CCGLView.h +++ b/cocos/platform/android/CCGLView.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "math/CCGeometry.h" -#include "2d/platform/CCGLViewProtocol.h" +#include "platform/CCGLViewProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCPlatformDefine.h b/cocos/platform/android/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/android/CCPlatformDefine.h rename to cocos/platform/android/CCPlatformDefine.h diff --git a/cocos/2d/platform/android/CCStdC.h b/cocos/platform/android/CCStdC.h similarity index 100% rename from cocos/2d/platform/android/CCStdC.h rename to cocos/platform/android/CCStdC.h diff --git a/cocos/2d/platform/android/java/.classpath b/cocos/platform/android/java/.classpath similarity index 100% rename from cocos/2d/platform/android/java/.classpath rename to cocos/platform/android/java/.classpath diff --git a/cocos/2d/platform/android/java/.project b/cocos/platform/android/java/.project similarity index 100% rename from cocos/2d/platform/android/java/.project rename to cocos/platform/android/java/.project diff --git a/cocos/2d/platform/android/java/.settings/org.eclipse.jdt.core.prefs b/cocos/platform/android/java/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from cocos/2d/platform/android/java/.settings/org.eclipse.jdt.core.prefs rename to cocos/platform/android/java/.settings/org.eclipse.jdt.core.prefs diff --git a/cocos/2d/platform/android/java/AndroidManifest.xml b/cocos/platform/android/java/AndroidManifest.xml similarity index 100% rename from cocos/2d/platform/android/java/AndroidManifest.xml rename to cocos/platform/android/java/AndroidManifest.xml diff --git a/cocos/2d/platform/android/java/ant.properties b/cocos/platform/android/java/ant.properties similarity index 100% rename from cocos/2d/platform/android/java/ant.properties rename to cocos/platform/android/java/ant.properties diff --git a/cocos/2d/platform/android/java/build.xml b/cocos/platform/android/java/build.xml similarity index 100% rename from cocos/2d/platform/android/java/build.xml rename to cocos/platform/android/java/build.xml diff --git a/cocos/2d/platform/android/java/proguard-project.txt b/cocos/platform/android/java/proguard-project.txt similarity index 100% rename from cocos/2d/platform/android/java/proguard-project.txt rename to cocos/platform/android/java/proguard-project.txt diff --git a/cocos/2d/platform/android/java/project.properties b/cocos/platform/android/java/project.properties similarity index 100% rename from cocos/2d/platform/android/java/project.properties rename to cocos/platform/android/java/project.properties diff --git a/cocos/2d/platform/android/java/res/.gitignore b/cocos/platform/android/java/res/.gitignore similarity index 100% rename from cocos/2d/platform/android/java/res/.gitignore rename to cocos/platform/android/java/res/.gitignore diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java similarity index 98% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java index 6b645d4f4f..a1bac4a217 100644 --- a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java @@ -58,14 +58,8 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe return sContext; } - // =========================================================== - // Constructors - // =========================================================== - @Override - protected void onCreate(final Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - + protected void onLoadNativeLibraries() { try { ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA); Bundle bundle = ai.metaData; @@ -74,10 +68,23 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe System.loadLibrary(libName); } catch (Exception e) { // ERROR + e.printStackTrace(); } } catch (PackageManager.NameNotFoundException e) { // ERROR + e.printStackTrace(); } + } + + // =========================================================== + // Constructors + // =========================================================== + + @Override + protected void onCreate(final Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + onLoadNativeLibraries(); sContext = this; this.mHandler = new Cocos2dxHandler(this); diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java similarity index 92% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java index 4695317696..e3617b80ef 100644 --- a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java @@ -66,13 +66,6 @@ public class Cocos2dxHelper { private static Cocos2dxHelperListener sCocos2dxHelperListener; private static Set onActivityResultListeners = new LinkedHashSet(); - /** - * Optional meta-that can be in the manifest for this component, specifying - * the name of the native shared library to load. If not specified, - * "main" is used. - */ - private static final String META_DATA_LIB_NAME = "android.app.lib_name"; - private static final String DEFAULT_LIB_NAME = "main"; // =========================================================== // Constructors @@ -88,23 +81,7 @@ public class Cocos2dxHelper { final ApplicationInfo applicationInfo = activity.getApplicationInfo(); Cocos2dxHelper.sCocos2dxHelperListener = (Cocos2dxHelperListener)activity; - - try { - // Get the lib_name from AndroidManifest.xml metadata - ActivityInfo ai = - activity.getPackageManager().getActivityInfo(activity.getIntent().getComponent(), PackageManager.GET_META_DATA); - if (null != ai.metaData) { - String lib_name = ai.metaData.getString(META_DATA_LIB_NAME); - if (null != lib_name) { - System.loadLibrary(lib_name); - } else { - System.loadLibrary(DEFAULT_LIB_NAME); - } - } - } catch (PackageManager.NameNotFoundException e) { - throw new RuntimeException("Error getting activity info", e); - } - + Cocos2dxHelper.sPackageName = applicationInfo.packageName; Cocos2dxHelper.sFileDirectory = activity.getFilesDir().getAbsolutePath(); Cocos2dxHelper.nativeSetApkPath(applicationInfo.sourceDir); diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java diff --git a/cocos/2d/platform/android/javaactivity.cpp b/cocos/platform/android/javaactivity.cpp similarity index 89% rename from cocos/2d/platform/android/javaactivity.cpp rename to cocos/platform/android/javaactivity.cpp index b4d265d162..58524d839a 100644 --- a/cocos/2d/platform/android/javaactivity.cpp +++ b/cocos/platform/android/javaactivity.cpp @@ -22,14 +22,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "base/CCPlatformConfig.h" +#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID + #include "CCApplication.h" -#include "CCDirector.h" -#include "CCDrawingPrimitives.h" -#include "CCEventCustom.h" -#include "CCEventType.h" +#include "base/CCDirector.h" +#include "base/CCEventCustom.h" +#include "base/CCEventType.h" +#include "renderer/CCGLProgramCache.h" +#include "renderer/CCTextureCache.h" +#include "2d/CCDrawingPrimitives.h" #include "CCGLView.h" -#include "CCGLProgramCache.h" -#include "CCTextureCache.h" #include "platform/android/jni/JniHelper.h" #include #include @@ -83,6 +86,8 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnSurfaceChanged(JNIEnv* env, { cocos2d::Application::getInstance()->applicationScreenSizeChanged(w, h); } - - + } + +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID + diff --git a/cocos/2d/platform/android/jni/DPIJni.cpp b/cocos/platform/android/jni/DPIJni.cpp similarity index 100% rename from cocos/2d/platform/android/jni/DPIJni.cpp rename to cocos/platform/android/jni/DPIJni.cpp diff --git a/cocos/2d/platform/android/jni/DPIJni.h b/cocos/platform/android/jni/DPIJni.h similarity index 100% rename from cocos/2d/platform/android/jni/DPIJni.h rename to cocos/platform/android/jni/DPIJni.h diff --git a/cocos/2d/platform/android/jni/IMEJni.cpp b/cocos/platform/android/jni/IMEJni.cpp similarity index 98% rename from cocos/2d/platform/android/jni/IMEJni.cpp rename to cocos/platform/android/jni/IMEJni.cpp index ea96931c28..8d9c00d5ee 100644 --- a/cocos/2d/platform/android/jni/IMEJni.cpp +++ b/cocos/platform/android/jni/IMEJni.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "IMEJni.h" -#include "CCIMEDispatcher.h" +#include "base/CCIMEDispatcher.h" #include "JniHelper.h" #include diff --git a/cocos/2d/platform/android/jni/IMEJni.h b/cocos/platform/android/jni/IMEJni.h similarity index 100% rename from cocos/2d/platform/android/jni/IMEJni.h rename to cocos/platform/android/jni/IMEJni.h diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp similarity index 86% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp index d61ddc4dc6..23199fe053 100644 --- a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp @@ -1,8 +1,8 @@ #include "JniHelper.h" #include -#include "CCDirector.h" -#include "CCEventDispatcher.h" -#include "CCEventAcceleration.h" +#include "base/CCDirector.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventAcceleration.h" #define TG3_GRAVITY_EARTH (9.80665f) diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp similarity index 98% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp index bdd9ee815f..1218a08dd4 100644 --- a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "JniHelper.h" #include -#include "CCDirector.h" +#include "base/CCDirector.h" #include "../CCApplication.h" #include "platform/CCFileUtils.h" #include diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h similarity index 100% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp similarity index 100% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h similarity index 100% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp similarity index 94% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp index 38886285df..28b4ba3bbf 100644 --- a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp @@ -1,8 +1,8 @@ -#include "CCIMEDispatcher.h" -#include "CCDirector.h" +#include "base/CCIMEDispatcher.h" +#include "base/CCDirector.h" +#include "base/CCEventType.h" #include "../CCApplication.h" #include "platform/CCFileUtils.h" -#include "CCEventType.h" #include "JniHelper.h" #include diff --git a/cocos/2d/platform/android/jni/JniHelper.cpp b/cocos/platform/android/jni/JniHelper.cpp similarity index 100% rename from cocos/2d/platform/android/jni/JniHelper.cpp rename to cocos/platform/android/jni/JniHelper.cpp diff --git a/cocos/2d/platform/android/jni/JniHelper.h b/cocos/platform/android/jni/JniHelper.h similarity index 100% rename from cocos/2d/platform/android/jni/JniHelper.h rename to cocos/platform/android/jni/JniHelper.h diff --git a/cocos/2d/platform/android/jni/TouchesJni.cpp b/cocos/platform/android/jni/TouchesJni.cpp similarity index 98% rename from cocos/2d/platform/android/jni/TouchesJni.cpp rename to cocos/platform/android/jni/TouchesJni.cpp index 3d53f3204b..023b7fba93 100644 --- a/cocos/2d/platform/android/jni/TouchesJni.cpp +++ b/cocos/platform/android/jni/TouchesJni.cpp @@ -21,8 +21,8 @@ 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 "CCDirector.h" -#include "CCEventKeyboard.h" +#include "base/CCDirector.h" +#include "base/CCEventKeyboard.h" #include "CCGLView.h" #include diff --git a/cocos/2d/platform/apple/CCFileUtilsApple.h b/cocos/platform/apple/CCFileUtilsApple.h similarity index 100% rename from cocos/2d/platform/apple/CCFileUtilsApple.h rename to cocos/platform/apple/CCFileUtilsApple.h diff --git a/cocos/2d/platform/apple/CCFileUtilsApple.mm b/cocos/platform/apple/CCFileUtilsApple.mm similarity index 100% rename from cocos/2d/platform/apple/CCFileUtilsApple.mm rename to cocos/platform/apple/CCFileUtilsApple.mm diff --git a/cocos/2d/platform/apple/CCLock.cpp b/cocos/platform/apple/CCLock.cpp similarity index 100% rename from cocos/2d/platform/apple/CCLock.cpp rename to cocos/platform/apple/CCLock.cpp diff --git a/cocos/2d/platform/apple/CCLock.h b/cocos/platform/apple/CCLock.h similarity index 100% rename from cocos/2d/platform/apple/CCLock.h rename to cocos/platform/apple/CCLock.h diff --git a/cocos/2d/platform/apple/CCThread.mm b/cocos/platform/apple/CCThread.mm similarity index 100% rename from cocos/2d/platform/apple/CCThread.mm rename to cocos/platform/apple/CCThread.mm diff --git a/cocos/2d/platform/desktop/CCGLView.cpp b/cocos/platform/desktop/CCGLView.cpp similarity index 99% rename from cocos/2d/platform/desktop/CCGLView.cpp rename to cocos/platform/desktop/CCGLView.cpp index 30077f7130..702244a29e 100644 --- a/cocos/2d/platform/desktop/CCGLView.cpp +++ b/cocos/platform/desktop/CCGLView.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "base/CCEventDispatcher.h" #include "base/CCEventKeyboard.h" #include "base/CCEventMouse.h" -#include "2d/CCIMEDispatcher.h" +#include "base/CCIMEDispatcher.h" #include diff --git a/cocos/2d/platform/desktop/CCGLView.h b/cocos/platform/desktop/CCGLView.h similarity index 98% rename from cocos/2d/platform/desktop/CCGLView.h rename to cocos/platform/desktop/CCGLView.h index 8160855ea8..065578730f 100644 --- a/cocos/2d/platform/desktop/CCGLView.h +++ b/cocos/platform/desktop/CCGLView.h @@ -27,8 +27,8 @@ THE SOFTWARE. #define __CC_EGLVIEW_DESKTOP_H__ #include "base/CCRef.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCGLViewProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCGLViewProtocol.h" #include "glfw3.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCApplication.h b/cocos/platform/ios/CCApplication.h similarity index 97% rename from cocos/2d/platform/ios/CCApplication.h rename to cocos/platform/ios/CCApplication.h index 64073ca7f7..b41cabd53a 100644 --- a/cocos/2d/platform/ios/CCApplication.h +++ b/cocos/platform/ios/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCApplication.mm b/cocos/platform/ios/CCApplication.mm similarity index 100% rename from cocos/2d/platform/ios/CCApplication.mm rename to cocos/platform/ios/CCApplication.mm diff --git a/cocos/2d/platform/ios/CCCommon.mm b/cocos/platform/ios/CCCommon.mm similarity index 97% rename from cocos/2d/platform/ios/CCCommon.mm rename to cocos/platform/ios/CCCommon.mm index 4607ba6e9f..6f1ee35d76 100644 --- a/cocos/2d/platform/ios/CCCommon.mm +++ b/cocos/platform/ios/CCCommon.mm @@ -26,7 +26,7 @@ #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include #include diff --git a/cocos/2d/platform/ios/CCDevice.mm b/cocos/platform/ios/CCDevice.mm similarity index 100% rename from cocos/2d/platform/ios/CCDevice.mm rename to cocos/platform/ios/CCDevice.mm diff --git a/cocos/2d/platform/ios/CCDirectorCaller.h b/cocos/platform/ios/CCDirectorCaller.h similarity index 92% rename from cocos/2d/platform/ios/CCDirectorCaller.h rename to cocos/platform/ios/CCDirectorCaller.h index f3b4ee4c92..c48a0598f4 100644 --- a/cocos/2d/platform/ios/CCDirectorCaller.h +++ b/cocos/platform/ios/CCDirectorCaller.h @@ -22,6 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + +#include "base/CCPlatformConfig.h" +#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS + #import @interface CCDirectorCaller : NSObject { @@ -35,3 +39,6 @@ +(id) sharedDirectorCaller; +(void) destroy; @end + +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS + diff --git a/cocos/2d/platform/ios/CCDirectorCaller.mm b/cocos/platform/ios/CCDirectorCaller.mm similarity index 96% rename from cocos/2d/platform/ios/CCDirectorCaller.mm rename to cocos/platform/ios/CCDirectorCaller.mm index f254530736..4adf295793 100644 --- a/cocos/2d/platform/ios/CCDirectorCaller.mm +++ b/cocos/platform/ios/CCDirectorCaller.mm @@ -22,6 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + +#include "base/CCPlatformConfig.h" +#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS + #import #import #import "CCDirectorCaller.h" @@ -101,3 +105,6 @@ static id s_sharedDirectorCaller; } @end + +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS + diff --git a/cocos/2d/platform/ios/CCEAGLView.h b/cocos/platform/ios/CCEAGLView.h similarity index 100% rename from cocos/2d/platform/ios/CCEAGLView.h rename to cocos/platform/ios/CCEAGLView.h diff --git a/cocos/2d/platform/ios/CCEAGLView.mm b/cocos/platform/ios/CCEAGLView.mm similarity index 100% rename from cocos/2d/platform/ios/CCEAGLView.mm rename to cocos/platform/ios/CCEAGLView.mm diff --git a/cocos/2d/platform/ios/CCES2Renderer.h b/cocos/platform/ios/CCES2Renderer.h similarity index 100% rename from cocos/2d/platform/ios/CCES2Renderer.h rename to cocos/platform/ios/CCES2Renderer.h diff --git a/cocos/2d/platform/ios/CCES2Renderer.m b/cocos/platform/ios/CCES2Renderer.m similarity index 100% rename from cocos/2d/platform/ios/CCES2Renderer.m rename to cocos/platform/ios/CCES2Renderer.m diff --git a/cocos/2d/platform/ios/CCESRenderer.h b/cocos/platform/ios/CCESRenderer.h similarity index 100% rename from cocos/2d/platform/ios/CCESRenderer.h rename to cocos/platform/ios/CCESRenderer.h diff --git a/cocos/2d/platform/ios/CCGL.h b/cocos/platform/ios/CCGL.h similarity index 100% rename from cocos/2d/platform/ios/CCGL.h rename to cocos/platform/ios/CCGL.h diff --git a/cocos/2d/platform/ios/CCGLView.h b/cocos/platform/ios/CCGLView.h similarity index 97% rename from cocos/2d/platform/ios/CCGLView.h rename to cocos/platform/ios/CCGLView.h index 8529ee1bfd..d5a62dd084 100644 --- a/cocos/2d/platform/ios/CCGLView.h +++ b/cocos/platform/ios/CCGLView.h @@ -30,8 +30,8 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "base/CCRef.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCGLViewProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCGLViewProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCGLView.mm b/cocos/platform/ios/CCGLView.mm similarity index 99% rename from cocos/2d/platform/ios/CCGLView.mm rename to cocos/platform/ios/CCGLView.mm index c5490ebf08..fa7844a2fb 100644 --- a/cocos/2d/platform/ios/CCGLView.mm +++ b/cocos/platform/ios/CCGLView.mm @@ -24,7 +24,6 @@ ****************************************************************************/ #include "base/CCPlatformConfig.h" - #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import diff --git a/cocos/2d/platform/ios/CCImage.mm b/cocos/platform/ios/CCImage.mm similarity index 98% rename from cocos/2d/platform/ios/CCImage.mm rename to cocos/platform/ios/CCImage.mm index 4a49ec0eb5..71ebce91a2 100644 --- a/cocos/2d/platform/ios/CCImage.mm +++ b/cocos/platform/ios/CCImage.mm @@ -26,14 +26,14 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#import "2d/platform/CCImage.h" -#import "2d/platform/CCCommon.h" +#import "platform/CCImage.h" +#import "platform/CCCommon.h" #import #import #import -#include +#include NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCPlatformDefine.h b/cocos/platform/ios/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/ios/CCPlatformDefine.h rename to cocos/platform/ios/CCPlatformDefine.h diff --git a/cocos/2d/platform/ios/CCStdC.h b/cocos/platform/ios/CCStdC.h similarity index 100% rename from cocos/2d/platform/ios/CCStdC.h rename to cocos/platform/ios/CCStdC.h diff --git a/cocos/2d/platform/ios/OpenGL_Internal.h b/cocos/platform/ios/OpenGL_Internal.h similarity index 100% rename from cocos/2d/platform/ios/OpenGL_Internal.h rename to cocos/platform/ios/OpenGL_Internal.h diff --git a/cocos/2d/platform/linux/CCApplication.cpp b/cocos/platform/linux/CCApplication.cpp similarity index 99% rename from cocos/2d/platform/linux/CCApplication.cpp rename to cocos/platform/linux/CCApplication.cpp index 89529c8553..ad4e47bc0a 100644 --- a/cocos/2d/platform/linux/CCApplication.cpp +++ b/cocos/platform/linux/CCApplication.cpp @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include #include "base/CCDirector.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/linux/CCApplication.h b/cocos/platform/linux/CCApplication.h similarity index 97% rename from cocos/2d/platform/linux/CCApplication.h rename to cocos/platform/linux/CCApplication.h index 2582e89a0d..f8fadac55e 100644 --- a/cocos/2d/platform/linux/CCApplication.h +++ b/cocos/platform/linux/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/linux/CCCommon.cpp b/cocos/platform/linux/CCCommon.cpp similarity index 97% rename from cocos/2d/platform/linux/CCCommon.cpp rename to cocos/platform/linux/CCCommon.cpp index adf4576bd0..320f96d108 100644 --- a/cocos/2d/platform/linux/CCCommon.cpp +++ b/cocos/platform/linux/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "CCStdC.h" #include "base/CCConsole.h" diff --git a/cocos/2d/platform/linux/CCDevice.cpp b/cocos/platform/linux/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/linux/CCDevice.cpp rename to cocos/platform/linux/CCDevice.cpp index 262c4301e7..5e007f7d28 100644 --- a/cocos/2d/platform/linux/CCDevice.cpp +++ b/cocos/platform/linux/CCDevice.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include #include @@ -36,7 +36,7 @@ THE SOFTWARE. #include #include #include -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "ft2build.h" #include FT_FREETYPE_H diff --git a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp b/cocos/platform/linux/CCFileUtilsLinux.cpp similarity index 99% rename from cocos/2d/platform/linux/CCFileUtilsLinux.cpp rename to cocos/platform/linux/CCFileUtilsLinux.cpp index f65f4da3e9..dfb882c885 100644 --- a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp +++ b/cocos/platform/linux/CCFileUtilsLinux.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "CCFileUtilsLinux.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/ccMacros.h" #include "CCApplication.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/platform/linux/CCFileUtilsLinux.h b/cocos/platform/linux/CCFileUtilsLinux.h similarity index 98% rename from cocos/2d/platform/linux/CCFileUtilsLinux.h rename to cocos/platform/linux/CCFileUtilsLinux.h index a1b45e8e29..e9a38a61eb 100644 --- a/cocos/2d/platform/linux/CCFileUtilsLinux.h +++ b/cocos/platform/linux/CCFileUtilsLinux.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include diff --git a/cocos/2d/platform/linux/CCGL.h b/cocos/platform/linux/CCGL.h similarity index 100% rename from cocos/2d/platform/linux/CCGL.h rename to cocos/platform/linux/CCGL.h diff --git a/cocos/2d/platform/linux/CCPlatformDefine.h b/cocos/platform/linux/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/linux/CCPlatformDefine.h rename to cocos/platform/linux/CCPlatformDefine.h diff --git a/cocos/2d/platform/linux/CCStdC.cpp b/cocos/platform/linux/CCStdC.cpp similarity index 100% rename from cocos/2d/platform/linux/CCStdC.cpp rename to cocos/platform/linux/CCStdC.cpp diff --git a/cocos/2d/platform/linux/CCStdC.h b/cocos/platform/linux/CCStdC.h similarity index 100% rename from cocos/2d/platform/linux/CCStdC.h rename to cocos/platform/linux/CCStdC.h diff --git a/cocos/2d/platform/mac/CCApplication.h b/cocos/platform/mac/CCApplication.h similarity index 97% rename from cocos/2d/platform/mac/CCApplication.h rename to cocos/platform/mac/CCApplication.h index 1e8f52d130..0655b4120b 100644 --- a/cocos/2d/platform/mac/CCApplication.h +++ b/cocos/platform/mac/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/mac/CCApplication.mm b/cocos/platform/mac/CCApplication.mm similarity index 99% rename from cocos/2d/platform/mac/CCApplication.mm rename to cocos/platform/mac/CCApplication.mm index d311c1d1b4..2f352d57d5 100644 --- a/cocos/2d/platform/mac/CCApplication.mm +++ b/cocos/platform/mac/CCApplication.mm @@ -27,12 +27,13 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #import "CCApplication.h" + #import #include -#include "2d/platform/CCFileUtils.h" + +#include "platform/CCFileUtils.h" #include "math/CCGeometry.h" #include "base/CCDirector.h" -#import "CCDirectorCaller.h" #include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/mac/CCCommon.mm b/cocos/platform/mac/CCCommon.mm similarity index 98% rename from cocos/2d/platform/mac/CCCommon.mm rename to cocos/platform/mac/CCCommon.mm index be3c7b3cad..4e042bd14e 100644 --- a/cocos/2d/platform/mac/CCCommon.mm +++ b/cocos/platform/mac/CCCommon.mm @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/CCDirector.h" #include "CCGLView.h" diff --git a/cocos/2d/platform/mac/CCDevice.mm b/cocos/platform/mac/CCDevice.mm similarity index 99% rename from cocos/2d/platform/mac/CCDevice.mm rename to cocos/platform/mac/CCDevice.mm index 9130d39315..0d13a3a586 100644 --- a/cocos/2d/platform/mac/CCDevice.mm +++ b/cocos/platform/mac/CCDevice.mm @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include #include #include diff --git a/cocos/2d/platform/mac/CCGL.h b/cocos/platform/mac/CCGL.h similarity index 100% rename from cocos/2d/platform/mac/CCGL.h rename to cocos/platform/mac/CCGL.h diff --git a/cocos/2d/platform/mac/CCPlatformDefine.h b/cocos/platform/mac/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/mac/CCPlatformDefine.h rename to cocos/platform/mac/CCPlatformDefine.h diff --git a/cocos/2d/platform/mac/CCStdC.h b/cocos/platform/mac/CCStdC.h similarity index 100% rename from cocos/2d/platform/mac/CCStdC.h rename to cocos/platform/mac/CCStdC.h diff --git a/cocos/2d/platform/win32/CCApplication.cpp b/cocos/platform/win32/CCApplication.cpp similarity index 99% rename from cocos/2d/platform/win32/CCApplication.cpp rename to cocos/platform/win32/CCApplication.cpp index a67ba66439..2afa94595b 100644 --- a/cocos/2d/platform/win32/CCApplication.cpp +++ b/cocos/platform/win32/CCApplication.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include "CCGLView.h" #include "base/CCDirector.h" #include -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" /** @brief This function change the PVRFrame show/hide setting in register. @param bEnable If true show the PVRFrame window, otherwise hide. diff --git a/cocos/2d/platform/win32/CCApplication.h b/cocos/platform/win32/CCApplication.h similarity index 97% rename from cocos/2d/platform/win32/CCApplication.h rename to cocos/platform/win32/CCApplication.h index b56cc0cc4c..7167a4d747 100644 --- a/cocos/2d/platform/win32/CCApplication.h +++ b/cocos/platform/win32/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCStdC.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCCommon.cpp b/cocos/platform/win32/CCCommon.cpp similarity index 98% rename from cocos/2d/platform/win32/CCCommon.cpp rename to cocos/platform/win32/CCCommon.cpp index d605e5bf91..a95ed75d00 100644 --- a/cocos/2d/platform/win32/CCCommon.cpp +++ b/cocos/platform/win32/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCDevice.cpp b/cocos/platform/win32/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/win32/CCDevice.cpp rename to cocos/platform/win32/CCDevice.cpp index 839e67e495..ab9b3e489b 100644 --- a/cocos/2d/platform/win32/CCDevice.cpp +++ b/cocos/platform/win32/CCDevice.cpp @@ -26,8 +26,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "2d/platform/CCDevice.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCDevice.h" +#include "platform/CCFileUtils.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp b/cocos/platform/win32/CCFileUtilsWin32.cpp similarity index 99% rename from cocos/2d/platform/win32/CCFileUtilsWin32.cpp rename to cocos/platform/win32/CCFileUtilsWin32.cpp index a146025d4e..2d036c5dfc 100644 --- a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp +++ b/cocos/platform/win32/CCFileUtilsWin32.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCFileUtilsWin32.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include using namespace std; diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.h b/cocos/platform/win32/CCFileUtilsWin32.h similarity index 99% rename from cocos/2d/platform/win32/CCFileUtilsWin32.h rename to cocos/platform/win32/CCFileUtilsWin32.h index d075aa94e9..fdb2b9106b 100644 --- a/cocos/2d/platform/win32/CCFileUtilsWin32.h +++ b/cocos/platform/win32/CCFileUtilsWin32.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include diff --git a/cocos/2d/platform/win32/CCGL.h b/cocos/platform/win32/CCGL.h similarity index 100% rename from cocos/2d/platform/win32/CCGL.h rename to cocos/platform/win32/CCGL.h diff --git a/cocos/2d/platform/win32/CCPlatformDefine.h b/cocos/platform/win32/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/win32/CCPlatformDefine.h rename to cocos/platform/win32/CCPlatformDefine.h diff --git a/cocos/2d/platform/win32/CCStdC.cpp b/cocos/platform/win32/CCStdC.cpp similarity index 100% rename from cocos/2d/platform/win32/CCStdC.cpp rename to cocos/platform/win32/CCStdC.cpp diff --git a/cocos/2d/platform/win32/CCStdC.h b/cocos/platform/win32/CCStdC.h similarity index 100% rename from cocos/2d/platform/win32/CCStdC.h rename to cocos/platform/win32/CCStdC.h diff --git a/cocos/2d/platform/win32/compat/stdint.h b/cocos/platform/win32/compat/stdint.h similarity index 100% rename from cocos/2d/platform/win32/compat/stdint.h rename to cocos/platform/win32/compat/stdint.h diff --git a/cocos/2d/platform/winrt/CCApplication.cpp b/cocos/platform/winrt/CCApplication.cpp similarity index 99% rename from cocos/2d/platform/winrt/CCApplication.cpp rename to cocos/platform/winrt/CCApplication.cpp index 139981cdca..7925bfa6ba 100644 --- a/cocos/2d/platform/winrt/CCApplication.cpp +++ b/cocos/platform/winrt/CCApplication.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #else #include "platform/wp8/CCGLView.h" #endif -#include "CCDirector.h" +#include "base/CCDirector.h" #include #include "platform/CCFileUtils.h" #include "CCWinRTUtils.h" diff --git a/cocos/2d/platform/winrt/CCApplication.h b/cocos/platform/winrt/CCApplication.h similarity index 98% rename from cocos/2d/platform/winrt/CCApplication.h rename to cocos/platform/winrt/CCApplication.h index 7d2deb39db..97028820e4 100644 --- a/cocos/2d/platform/winrt/CCApplication.h +++ b/cocos/platform/winrt/CCApplication.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CC_APPLICATION_WINRT_H__ #define __CC_APPLICATION_WINRT_H__ -#include "CCPlatformConfig.h" +#include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "CCStdC.h" diff --git a/cocos/2d/platform/winrt/CCCommon.cpp b/cocos/platform/winrt/CCCommon.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCCommon.cpp rename to cocos/platform/winrt/CCCommon.cpp diff --git a/cocos/2d/platform/winrt/CCDevice.cpp b/cocos/platform/winrt/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/winrt/CCDevice.cpp rename to cocos/platform/winrt/CCDevice.cpp index 46c9b0cd43..bbbad71687 100644 --- a/cocos/2d/platform/winrt/CCDevice.cpp +++ b/cocos/platform/winrt/CCDevice.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCPlatformConfig.h" +#include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "cocos2d.h" diff --git a/cocos/2d/platform/winrt/CCFileUtilsWinRT.cpp b/cocos/platform/winrt/CCFileUtilsWinRT.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCFileUtilsWinRT.cpp rename to cocos/platform/winrt/CCFileUtilsWinRT.cpp diff --git a/cocos/2d/platform/winrt/CCFileUtilsWinRT.h b/cocos/platform/winrt/CCFileUtilsWinRT.h similarity index 97% rename from cocos/2d/platform/winrt/CCFileUtilsWinRT.h rename to cocos/platform/winrt/CCFileUtilsWinRT.h index 2ace3f6f22..8e130e496e 100644 --- a/cocos/2d/platform/winrt/CCFileUtilsWinRT.h +++ b/cocos/platform/winrt/CCFileUtilsWinRT.h @@ -25,12 +25,13 @@ #ifndef __CC_FILEUTILS_WINRT_H__ #define __CC_FILEUTILS_WINRT_H__ -#include "platform/CCFileUtils.h" -#include "CCPlatformMacros.h" -#include "ccTypes.h" #include #include +#include "platform/CCFileUtils.h" +#include "base/CCPlatformMacros.h" +#include "base/ccTypes.h" + NS_CC_BEGIN /** diff --git a/cocos/2d/platform/winrt/CCFreeTypeFont.cpp b/cocos/platform/winrt/CCFreeTypeFont.cpp similarity index 99% rename from cocos/2d/platform/winrt/CCFreeTypeFont.cpp rename to cocos/platform/winrt/CCFreeTypeFont.cpp index 9f5b4acc58..5acba12a9d 100644 --- a/cocos/2d/platform/winrt/CCFreeTypeFont.cpp +++ b/cocos/platform/winrt/CCFreeTypeFont.cpp @@ -22,7 +22,7 @@ ****************************************************************************/ #include "CCFreeTypeFont.h" -#include "CCDirector.h" +#include "base/CCDirector.h" #include "platform/CCFileUtils.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) diff --git a/cocos/2d/platform/winrt/CCFreeTypeFont.h b/cocos/platform/winrt/CCFreeTypeFont.h similarity index 100% rename from cocos/2d/platform/winrt/CCFreeTypeFont.h rename to cocos/platform/winrt/CCFreeTypeFont.h diff --git a/cocos/2d/platform/winrt/CCGL.h b/cocos/platform/winrt/CCGL.h similarity index 100% rename from cocos/2d/platform/winrt/CCGL.h rename to cocos/platform/winrt/CCGL.h diff --git a/cocos/2d/platform/winrt/CCGLView.cpp b/cocos/platform/winrt/CCGLView.cpp similarity index 98% rename from cocos/2d/platform/winrt/CCGLView.cpp rename to cocos/platform/winrt/CCGLView.cpp index f78be18d6c..118449fa25 100644 --- a/cocos/2d/platform/winrt/CCGLView.cpp +++ b/cocos/platform/winrt/CCGLView.cpp @@ -23,11 +23,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include "CCGLView.h" -#include "ccMacros.h" -#include "CCDirector.h" -#include "CCTouch.h" -#include "CCIMEDispatcher.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "base/CCTouch.h" +#include "2d/CCIMEDispatcher.h" #include "CCApplication.h" #include "CCWinRTUtils.h" @@ -577,3 +580,5 @@ void GLView::QueueEvent(std::shared_ptr& event) } NS_CC_END + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/CCGLView.h b/cocos/platform/winrt/CCGLView.h similarity index 97% rename from cocos/2d/platform/winrt/CCGLView.h rename to cocos/platform/winrt/CCGLView.h index 6864805e59..96b403a3c1 100644 --- a/cocos/2d/platform/winrt/CCGLView.h +++ b/cocos/platform/winrt/CCGLView.h @@ -26,6 +26,9 @@ THE SOFTWARE. #ifndef __CC_EGLVIEW_WINRT_H__ #define __CC_EGLVIEW_WINRT_H__ +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include "CCStdC.h" #include "CCGL.h" #include "platform/CCCommon.h" @@ -164,4 +167,6 @@ private: NS_CC_END +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #endif // end of __CC_EGLVIEW_WINRT_H__ diff --git a/cocos/2d/platform/winrt/CCGL_Angle.h b/cocos/platform/winrt/CCGL_Angle.h similarity index 100% rename from cocos/2d/platform/winrt/CCGL_Angle.h rename to cocos/platform/winrt/CCGL_Angle.h diff --git a/cocos/2d/platform/winrt/CCPThreadWinRT.cpp b/cocos/platform/winrt/CCPThreadWinRT.cpp similarity index 92% rename from cocos/2d/platform/winrt/CCPThreadWinRT.cpp rename to cocos/platform/winrt/CCPThreadWinRT.cpp index 3d63daf631..5bd691eb9f 100644 --- a/cocos/2d/platform/winrt/CCPThreadWinRT.cpp +++ b/cocos/platform/winrt/CCPThreadWinRT.cpp @@ -22,9 +22,13 @@ 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 "CCPThreadWinRT.h" +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + +#include "CCPThreadWinRT.h" + NS_CC_BEGIN void pthread_mutex_init(pthread_mutex_t* m, void* attributes) { @@ -49,3 +53,5 @@ void pthread_mutex_destroy(pthread_mutex_t* m) NS_CC_END + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/CCPThreadWinRT.h b/cocos/platform/winrt/CCPThreadWinRT.h similarity index 91% rename from cocos/2d/platform/winrt/CCPThreadWinRT.h rename to cocos/platform/winrt/CCPThreadWinRT.h index 042d10e36a..2a75a9535a 100644 --- a/cocos/2d/platform/winrt/CCPThreadWinRT.h +++ b/cocos/platform/winrt/CCPThreadWinRT.h @@ -26,7 +26,11 @@ THE SOFTWARE. #ifndef __CCPTHREADWINRT_H__ #define __CCPTHREADWINRT_H__ -#include "CCPlatformMacros.h" + +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + +#include "base/CCPlatformMacros.h" #include @@ -49,9 +53,9 @@ void pthread_mutex_destroy(pthread_mutex_t* m); #define pthread_cond_signal(x) #define pthread_cond_init(x, y) - - - NS_CC_END + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #endif // __CCPTHREADWINRT_H__ diff --git a/cocos/2d/platform/winrt/CCPlatformDefine.h b/cocos/platform/winrt/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/winrt/CCPlatformDefine.h rename to cocos/platform/winrt/CCPlatformDefine.h diff --git a/cocos/2d/platform/winrt/CCPrecompiledShaders.cpp b/cocos/platform/winrt/CCPrecompiledShaders.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCPrecompiledShaders.cpp rename to cocos/platform/winrt/CCPrecompiledShaders.cpp diff --git a/cocos/2d/platform/winrt/CCPrecompiledShaders.h b/cocos/platform/winrt/CCPrecompiledShaders.h similarity index 100% rename from cocos/2d/platform/winrt/CCPrecompiledShaders.h rename to cocos/platform/winrt/CCPrecompiledShaders.h diff --git a/cocos/2d/platform/winrt/CCStdC.cpp b/cocos/platform/winrt/CCStdC.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCStdC.cpp rename to cocos/platform/winrt/CCStdC.cpp diff --git a/cocos/2d/platform/winrt/CCStdC.h b/cocos/platform/winrt/CCStdC.h similarity index 97% rename from cocos/2d/platform/winrt/CCStdC.h rename to cocos/platform/winrt/CCStdC.h index 99992001ba..21d91faea6 100644 --- a/cocos/2d/platform/winrt/CCStdC.h +++ b/cocos/platform/winrt/CCStdC.h @@ -26,11 +26,11 @@ THE SOFTWARE. #ifndef __CC_STD_C_H__ #define __CC_STD_C_H__ -#include "CCPlatformConfig.h" +#include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include diff --git a/cocos/2d/platform/winrt/CCWinRTUtils.cpp b/cocos/platform/winrt/CCWinRTUtils.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCWinRTUtils.cpp rename to cocos/platform/winrt/CCWinRTUtils.cpp diff --git a/cocos/2d/platform/winrt/CCWinRTUtils.h b/cocos/platform/winrt/CCWinRTUtils.h similarity index 98% rename from cocos/2d/platform/winrt/CCWinRTUtils.h rename to cocos/platform/winrt/CCWinRTUtils.h index d3db742355..f289ead8c4 100644 --- a/cocos/2d/platform/winrt/CCWinRTUtils.h +++ b/cocos/platform/winrt/CCWinRTUtils.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCWINRT_UTILS_H__ #define __CCWINRT_UTILS_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include diff --git a/cocos/2d/platform/winrt/DirectXBase.cpp b/cocos/platform/winrt/DirectXBase.cpp similarity index 99% rename from cocos/2d/platform/winrt/DirectXBase.cpp rename to cocos/platform/winrt/DirectXBase.cpp index 7f6a2c6655..27166a9758 100644 --- a/cocos/2d/platform/winrt/DirectXBase.cpp +++ b/cocos/platform/winrt/DirectXBase.cpp @@ -16,6 +16,10 @@ // 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 "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include "DirectXBase.h" #include #include @@ -463,4 +467,4 @@ float DirectXBase::ConvertDipsToPixels(float dips) return floor(dips * m_dpi / dipsPerInch + 0.5f); // Round to nearest integer. } - +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/DirectXBase.h b/cocos/platform/winrt/DirectXBase.h similarity index 96% rename from cocos/2d/platform/winrt/DirectXBase.h rename to cocos/platform/winrt/DirectXBase.h index eb37bfb87d..73e7a1276b 100644 --- a/cocos/2d/platform/winrt/DirectXBase.h +++ b/cocos/platform/winrt/DirectXBase.h @@ -18,6 +18,9 @@ //----------------------------------------------------------------------------------------------- #pragma once +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include #include #include @@ -76,3 +79,5 @@ protected private: }; #pragma warning (default: 4449) + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/DirectXHelper.h b/cocos/platform/winrt/DirectXHelper.h similarity index 92% rename from cocos/2d/platform/winrt/DirectXHelper.h rename to cocos/platform/winrt/DirectXHelper.h index 2166d0c91c..6065191353 100644 --- a/cocos/2d/platform/winrt/DirectXHelper.h +++ b/cocos/platform/winrt/DirectXHelper.h @@ -18,6 +18,10 @@ //----------------------------------------------------------------------------------------------- #pragma once + +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + // Helper utilities to make Win32 APIs work with exceptions. namespace DX { @@ -30,3 +34,5 @@ namespace DX } } } + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/InputEvent.cpp b/cocos/platform/winrt/InputEvent.cpp similarity index 98% rename from cocos/2d/platform/winrt/InputEvent.cpp rename to cocos/platform/winrt/InputEvent.cpp index 44ac44c240..ccc49a5ad0 100644 --- a/cocos/2d/platform/winrt/InputEvent.cpp +++ b/cocos/platform/winrt/InputEvent.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "InputEvent.h" #include "CCGLView.h" -#include "CCEventAcceleration.h" +#include "base/CCEventAcceleration.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/winrt/InputEvent.h b/cocos/platform/winrt/InputEvent.h similarity index 100% rename from cocos/2d/platform/winrt/InputEvent.h rename to cocos/platform/winrt/InputEvent.h diff --git a/cocos/2d/platform/winrt/InputEventTypes.h b/cocos/platform/winrt/InputEventTypes.h similarity index 100% rename from cocos/2d/platform/winrt/InputEventTypes.h rename to cocos/platform/winrt/InputEventTypes.h diff --git a/cocos/2d/platform/winrt/inet_ntop_winrt.cpp b/cocos/platform/winrt/inet_ntop_winrt.cpp similarity index 100% rename from cocos/2d/platform/winrt/inet_ntop_winrt.cpp rename to cocos/platform/winrt/inet_ntop_winrt.cpp diff --git a/cocos/2d/platform/winrt/inet_ntop_winrt.h b/cocos/platform/winrt/inet_ntop_winrt.h similarity index 100% rename from cocos/2d/platform/winrt/inet_ntop_winrt.h rename to cocos/platform/winrt/inet_ntop_winrt.h diff --git a/cocos/2d/platform/winrt/pch.cpp b/cocos/platform/winrt/pch.cpp similarity index 100% rename from cocos/2d/platform/winrt/pch.cpp rename to cocos/platform/winrt/pch.cpp diff --git a/cocos/2d/platform/winrt/pch.h b/cocos/platform/winrt/pch.h similarity index 100% rename from cocos/2d/platform/winrt/pch.h rename to cocos/platform/winrt/pch.h diff --git a/cocos/2d/platform/winrt/sha1.cpp b/cocos/platform/winrt/sha1.cpp similarity index 100% rename from cocos/2d/platform/winrt/sha1.cpp rename to cocos/platform/winrt/sha1.cpp diff --git a/cocos/2d/platform/winrt/sha1.h b/cocos/platform/winrt/sha1.h similarity index 100% rename from cocos/2d/platform/winrt/sha1.h rename to cocos/platform/winrt/sha1.h diff --git a/cocos/2d/platform/winrt/shaders/precompiledshaders.h b/cocos/platform/winrt/shaders/precompiledshaders.h similarity index 100% rename from cocos/2d/platform/winrt/shaders/precompiledshaders.h rename to cocos/platform/winrt/shaders/precompiledshaders.h diff --git a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj b/cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj similarity index 74% rename from cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj rename to cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj index 11074399d4..96dcb41aeb 100644 --- a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj +++ b/cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj @@ -68,12 +68,12 @@ echo "Copying WP8-XAML CPP template files" -xcopy "xaml\App.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\App.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq @@ -89,12 +89,12 @@ xcopy "xaml\EditBox.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp echo "Copying WP8-XAML CPP template files" -xcopy "xaml\App.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\App.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq @@ -110,12 +110,12 @@ xcopy "xaml\EditBox.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp echo "Copying WP8-XAML CPP template files" -xcopy "xaml\App.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\App.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq @@ -131,12 +131,12 @@ xcopy "xaml\EditBox.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp echo "Copying WP8-XAML CPP template files" -xcopy "xaml\App.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\App.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\MainPage.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq -xcopy "xaml\EditBox.xaml.cs" "..\..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\App.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\MainPage.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq +xcopy "xaml\EditBox.xaml.cs" "..\..\..\templates\cpp-template-default\proj.wp8-xaml\HelloCpp\*" /eiycq diff --git a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters b/cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters similarity index 100% rename from cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters rename to cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters diff --git a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user b/cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user similarity index 94% rename from cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user rename to cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user index 17f726ed50..3977273203 100644 --- a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user +++ b/cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user @@ -3,4 +3,4 @@ true - \ No newline at end of file + diff --git a/cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp rename to cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.h b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.h rename to cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp b/cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp rename to cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.h b/cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.h rename to cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.cpp b/cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.cpp rename to cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.h b/cocos/platform/wp8-xaml/cpp/Direct3DInterop.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.h rename to cocos/platform/wp8-xaml/cpp/Direct3DInterop.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/DirectXBase.cpp b/cocos/platform/wp8-xaml/cpp/DirectXBase.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/DirectXBase.cpp rename to cocos/platform/wp8-xaml/cpp/DirectXBase.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/DirectXBase.h b/cocos/platform/wp8-xaml/cpp/DirectXBase.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/DirectXBase.h rename to cocos/platform/wp8-xaml/cpp/DirectXBase.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/DirectXHelper.h b/cocos/platform/wp8-xaml/cpp/DirectXHelper.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/DirectXHelper.h rename to cocos/platform/wp8-xaml/cpp/DirectXHelper.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.cpp b/cocos/platform/wp8-xaml/cpp/EditBoxEvent.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.cpp rename to cocos/platform/wp8-xaml/cpp/EditBoxEvent.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.h b/cocos/platform/wp8-xaml/cpp/EditBoxEvent.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.h rename to cocos/platform/wp8-xaml/cpp/EditBoxEvent.h diff --git a/cocos/2d/platform/wp8-xaml/xaml/App.xaml b/cocos/platform/wp8-xaml/xaml/App.xaml similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/App.xaml rename to cocos/platform/wp8-xaml/xaml/App.xaml diff --git a/cocos/2d/platform/wp8-xaml/xaml/App.xaml.cs b/cocos/platform/wp8-xaml/xaml/App.xaml.cs similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/App.xaml.cs rename to cocos/platform/wp8-xaml/xaml/App.xaml.cs diff --git a/cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml b/cocos/platform/wp8-xaml/xaml/EditBox.xaml similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml rename to cocos/platform/wp8-xaml/xaml/EditBox.xaml diff --git a/cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml.cs b/cocos/platform/wp8-xaml/xaml/EditBox.xaml.cs similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml.cs rename to cocos/platform/wp8-xaml/xaml/EditBox.xaml.cs diff --git a/cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml b/cocos/platform/wp8-xaml/xaml/MainPage.xaml similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml rename to cocos/platform/wp8-xaml/xaml/MainPage.xaml diff --git a/cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml.cs b/cocos/platform/wp8-xaml/xaml/MainPage.xaml.cs similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml.cs rename to cocos/platform/wp8-xaml/xaml/MainPage.xaml.cs diff --git a/cocos/2d/platform/wp8/CCGLView.cpp b/cocos/platform/wp8/CCGLView.cpp similarity index 98% rename from cocos/2d/platform/wp8/CCGLView.cpp rename to cocos/platform/wp8/CCGLView.cpp index d89fab28f5..c6869b3fe8 100644 --- a/cocos/2d/platform/wp8/CCGLView.cpp +++ b/cocos/platform/wp8/CCGLView.cpp @@ -24,14 +24,14 @@ THE SOFTWARE. ****************************************************************************/ #include "CCGLView.h" -#include "CCSet.h" -#include "ccMacros.h" -#include "CCDirector.h" -#include "CCTouch.h" -#include "CCIMEDispatcher.h" +#include "deprecated/CCSet.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "base/CCTouch.h" +#include "base/CCIMEDispatcher.h" #include "CCApplication.h" #include "CCWinRTUtils.h" -#include "CCNotificationCenter.h" +#include "deprecated/CCNotificationCenter.h" using namespace Platform; using namespace Windows::Foundation; @@ -397,7 +397,7 @@ void GLView::UpdateWindowSize() } } -const Matrix& GLView::getOrientationMatrix() const +const Mat4& GLView::getOrientationMatrix() const { return m_orientationMatrix; }; diff --git a/cocos/2d/platform/wp8/CCGLView.h b/cocos/platform/wp8/CCGLView.h similarity index 96% rename from cocos/2d/platform/wp8/CCGLView.h rename to cocos/platform/wp8/CCGLView.h index 9ffa1f9d29..69914a8aa2 100644 --- a/cocos/2d/platform/wp8/CCGLView.h +++ b/cocos/platform/wp8/CCGLView.h @@ -61,8 +61,8 @@ public: virtual void swapBuffers(); virtual void setViewPortInPoints(float x , float y , float w , float h); virtual void setScissorInPoints(float x , float y , float w , float h); - const Matrix& getOrientationMatrix() const; - const Matrix& getReverseOrientationMatrix () const {return m_reverseOrientationMatrix;}; + const Mat4& getOrientationMatrix() const; + const Mat4& getReverseOrientationMatrix () const {return m_reverseOrientationMatrix;}; Windows::Graphics::Display::DisplayOrientations getDeviceOrientation() {return m_orientation;}; @@ -162,8 +162,8 @@ private: bool m_lastPointValid; bool m_windowClosed; bool m_windowVisible; - Matrix m_orientationMatrix; - Matrix m_reverseOrientationMatrix; + Mat4 m_orientationMatrix; + Mat4 m_reverseOrientationMatrix; bool m_running; diff --git a/cocos/2d/platform/wp8/Direct3DBase.cpp b/cocos/platform/wp8/Direct3DBase.cpp similarity index 95% rename from cocos/2d/platform/wp8/Direct3DBase.cpp rename to cocos/platform/wp8/Direct3DBase.cpp index f909b07507..7d378b3ef0 100644 --- a/cocos/2d/platform/wp8/Direct3DBase.cpp +++ b/cocos/platform/wp8/Direct3DBase.cpp @@ -1,4 +1,8 @@ -#include "Direct3DBase.h" +// XXX: For some reason, this file must not be compiled +// XXX: Ask MS why +#if 0 + +#include "Direct3DBase.h" using namespace DirectX; @@ -330,9 +334,9 @@ void Direct3DBase::ComputeOrientationMatrices() } } -Vec2 Direct3DBase::TransformToOrientation(Vec2 point, bool dipsToPixels) +Point Direct3DBase::TransformToOrientation(Point point, bool dipsToPixels) { - Vec2 returnValue; + Point returnValue; switch (m_orientation) { @@ -340,20 +344,22 @@ Vec2 Direct3DBase::TransformToOrientation(Vec2 point, bool dipsToPixels) returnValue = point; break; case DisplayOrientations::Landscape: - returnValue = Vec2(point.Y, m_windowBounds.Width - point.X); + returnValue = Point(point.Y, m_windowBounds.Width - point.X); break; case DisplayOrientations::PortraitFlipped: - returnValue = Vec2(m_windowBounds.Width - point.X, m_windowBounds.Height - point.Y); + returnValue = Point(m_windowBounds.Width - point.X, m_windowBounds.Height - point.Y); break; case DisplayOrientations::LandscapeFlipped: - returnValue = Vec2(m_windowBounds.Height -point.Y, point.X); + returnValue = Point(m_windowBounds.Height - point.Y, point.X); break; default: throw ref new Platform::FailureException(); break; } - return dipsToPixels ? Vec2(ConvertDipsToPixels(returnValue.X), + return dipsToPixels ? Point(ConvertDipsToPixels(returnValue.X), ConvertDipsToPixels(returnValue.Y)) : returnValue; } + +#endif // 0 diff --git a/cocos/2d/platform/wp8/Direct3DBase.h b/cocos/platform/wp8/Direct3DBase.h similarity index 89% rename from cocos/2d/platform/wp8/Direct3DBase.h rename to cocos/platform/wp8/Direct3DBase.h index dfc4bfd3af..d5737bbbde 100644 --- a/cocos/2d/platform/wp8/Direct3DBase.h +++ b/cocos/platform/wp8/Direct3DBase.h @@ -1,5 +1,10 @@ #pragma once +// XXX: For some reason, this file must not be compiled +// XXX: Ask MS why +#if 0 + + #include #include #include @@ -24,7 +29,7 @@ public: virtual void Present(); virtual float ConvertDipsToPixels(float dips); virtual void ComputeOrientationMatrices(); - virtual Windows::Foundation::Vec2 TransformToOrientation(Windows::Foundation::Vec2 point, bool dipsToPixels=true); + virtual Windows::Foundation::Point TransformToOrientation(Windows::Foundation::Point point, bool dipsToPixels=true); float getOrientedWindowWidth() {return m_orientedScreenSize.Width;}; float getOrientedWindowHeight() {return m_orientedScreenSize.Height;}; @@ -53,4 +58,6 @@ protected private: // Transforms used for rendering 2D and 3D elements in proper orientation DirectX::XMMATRIX m_orientationTransform3D; DirectX::XMMATRIX m_orientationTransform2D; -}; \ No newline at end of file +}; + +#endif // 0 diff --git a/cocos/2d/platform/wp8/DirectXBase.cpp b/cocos/platform/wp8/DirectXBase.cpp similarity index 98% rename from cocos/2d/platform/wp8/DirectXBase.cpp rename to cocos/platform/wp8/DirectXBase.cpp index 0682646062..416106ce8b 100644 --- a/cocos/2d/platform/wp8/DirectXBase.cpp +++ b/cocos/platform/wp8/DirectXBase.cpp @@ -1,4 +1,8 @@ -#include +// XXX: For some reason, this file must not be compiled +// XXX: Ask MS why +#if 0 + +#include #include #include "DirectXBase.h" @@ -275,4 +279,6 @@ void DirectXBase::SetDpi(float dpi) // will not change, and the window resize code will only be executed once. UpdateForWindowSizeChange(); } -} \ No newline at end of file +} + +#endif //0 diff --git a/cocos/2d/platform/wp8/DirectXBase.h b/cocos/platform/wp8/DirectXBase.h similarity index 91% rename from cocos/2d/platform/wp8/DirectXBase.h rename to cocos/platform/wp8/DirectXBase.h index 0749973da6..72187253a5 100644 --- a/cocos/2d/platform/wp8/DirectXBase.h +++ b/cocos/platform/wp8/DirectXBase.h @@ -1,4 +1,8 @@ -#pragma once +// XXX: For some reason, this file must not be compiled +// XXX: Ask MS why +#if 0 + +#pragma once #include "DirectXHelper.h" #include @@ -37,4 +41,6 @@ protected private: Platform::Agile m_window; float m_dpi; -}; \ No newline at end of file +}; + +#endif // 0 \ No newline at end of file diff --git a/cocos/2d/platform/wp8/shaders/precompiledshaders.h b/cocos/platform/wp8/shaders/precompiledshaders.h similarity index 98% rename from cocos/2d/platform/wp8/shaders/precompiledshaders.h rename to cocos/platform/wp8/shaders/precompiledshaders.h index 870432ceed..389aa191f8 100644 --- a/cocos/2d/platform/wp8/shaders/precompiledshaders.h +++ b/cocos/platform/wp8/shaders/precompiledshaders.h @@ -1,5 +1,383 @@ #define PRECOMPILED_SHADERS +const unsigned char s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 1, 0, + 0, 0, 82, 139, 0, 0, 7, 0, + 0, 0, 97, 95, 99, 111, 108, 111, +114, 0, 0, 0, 0, 80, 139, 0, + 0, 10, 0, 0, 0, 97, 95, 116, +101, 120, 67, 111, 111, 114, 100, 2, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 2, 0, 0, 0, 92, 139, 0, 0, +242, 141, 0, 0, 12, 0, 0, 0, + 67, 67, 95, 77, 86, 80, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 4, 0, 0, 0, 94, 139, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 0, + 67, 67, 95, 84, 101, 120, 116, 117, +114, 101, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 2, 0, 0, 0, 12, + 0, 0, 0, 67, 67, 95, 77, 86, + 80, 77, 97, 116, 114, 105, 120, 0, + 0, 0, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 67, 67, 95, 84, 101, +120, 116, 117, 114, 101, 48, 0, 0, + 0, 0, 1, 0, 0, 0, 248, 3, + 0, 0, 4, 5, 0, 0, 0, 0, + 0, 0, 20, 134, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 68, 88, 66, 67, 11, 95, + 74, 206, 145, 124, 32, 219, 67, 19, + 26, 23, 189, 75, 35, 86, 1, 0, + 0, 0, 248, 3, 0, 0, 6, 0, + 0, 0, 56, 0, 0, 0, 228, 0, + 0, 0, 244, 1, 0, 0, 112, 2, + 0, 0, 48, 3, 0, 0, 124, 3, + 0, 0, 65, 111, 110, 57, 164, 0, + 0, 0, 164, 0, 0, 0, 0, 2, +255, 255, 124, 0, 0, 0, 40, 0, + 0, 0, 0, 0, 40, 0, 0, 0, + 40, 0, 0, 0, 40, 0, 1, 0, + 36, 0, 0, 0, 40, 0, 0, 0, + 0, 0, 1, 2, 255, 255, 31, 0, + 0, 2, 0, 0, 0, 128, 0, 0, + 15, 176, 31, 0, 0, 2, 0, 0, + 0, 128, 1, 0, 3, 176, 31, 0, + 0, 2, 0, 0, 0, 144, 0, 8, + 15, 160, 66, 0, 0, 3, 0, 0, + 15, 128, 1, 0, 228, 176, 0, 8, +228, 160, 5, 0, 0, 3, 0, 0, + 15, 128, 0, 0, 228, 128, 0, 0, +228, 176, 1, 0, 0, 2, 0, 8, + 15, 128, 0, 0, 228, 128, 1, 0, + 0, 2, 1, 8, 15, 128, 0, 0, +228, 128, 1, 0, 0, 2, 2, 8, + 15, 128, 0, 0, 228, 128, 1, 0, + 0, 2, 3, 8, 15, 128, 0, 0, +228, 128, 255, 255, 0, 0, 83, 72, + 68, 82, 8, 1, 0, 0, 64, 0, + 0, 0, 66, 0, 0, 0, 90, 0, + 0, 3, 0, 96, 16, 0, 0, 0, + 0, 0, 88, 24, 0, 4, 0, 112, + 16, 0, 0, 0, 0, 0, 85, 85, + 0, 0, 98, 16, 0, 3, 242, 16, + 16, 0, 0, 0, 0, 0, 98, 16, + 0, 3, 50, 16, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 1, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 2, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 3, 0, + 0, 0, 104, 0, 0, 2, 1, 0, + 0, 0, 69, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, 70, 16, + 16, 0, 1, 0, 0, 0, 70, 126, + 16, 0, 0, 0, 0, 0, 0, 96, + 16, 0, 0, 0, 0, 0, 56, 0, + 0, 7, 242, 0, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 70, 30, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 2, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, 3, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, 83, 84, + 65, 84, 116, 0, 0, 0, 7, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 82, 68, 69, 70, 184, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 28, 0, + 0, 0, 0, 4, 255, 255, 0, 65, + 0, 0, 134, 0, 0, 0, 92, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, 113, 0, + 0, 0, 2, 0, 0, 0, 5, 0, + 0, 0, 4, 0, 0, 0, 255, 255, +255, 255, 0, 0, 0, 0, 1, 0, + 0, 0, 13, 0, 0, 0, 115, 97, +109, 112, 108, 101, 114, 95, 95, 67, + 67, 95, 84, 101, 120, 116, 117, 114, +101, 48, 0, 116, 101, 120, 116, 117, +114, 101, 95, 95, 67, 67, 95, 84, +101, 120, 116, 117, 114, 101, 48, 0, + 77, 105, 99, 114, 111, 115, 111, 102, +116, 32, 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, 100, 101, +114, 32, 67, 111, 109, 112, 105, 108, +101, 114, 32, 54, 46, 51, 46, 57, + 54, 48, 48, 46, 49, 54, 51, 56, + 52, 0, 73, 83, 71, 78, 68, 0, + 0, 0, 2, 0, 0, 0, 8, 0, + 0, 0, 56, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 15, 15, + 0, 0, 56, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, 3, 3, + 0, 0, 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, 79, 83, + 71, 78, 116, 0, 0, 0, 4, 0, + 0, 0, 8, 0, 0, 0, 104, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 1, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 2, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 2, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 3, 0, + 0, 0, 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, 116, 0, +171, 171, 68, 88, 66, 67, 235, 56, +180, 223, 125, 231, 231, 218, 70, 75, + 12, 63, 200, 233, 69, 121, 1, 0, + 0, 0, 4, 5, 0, 0, 6, 0, + 0, 0, 56, 0, 0, 0, 92, 1, + 0, 0, 224, 2, 0, 0, 92, 3, + 0, 0, 48, 4, 0, 0, 148, 4, + 0, 0, 65, 111, 110, 57, 28, 1, + 0, 0, 28, 1, 0, 0, 0, 2, +254, 255, 232, 0, 0, 0, 52, 0, + 0, 0, 1, 0, 36, 0, 0, 0, + 48, 0, 0, 0, 48, 0, 0, 0, + 36, 0, 1, 0, 48, 0, 0, 0, + 0, 0, 4, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 2, +254, 255, 81, 0, 0, 5, 5, 0, + 15, 160, 0, 0, 0, 63, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 31, 0, 0, 2, 5, 0, + 0, 128, 0, 0, 15, 144, 31, 0, + 0, 2, 5, 0, 1, 128, 1, 0, + 15, 144, 31, 0, 0, 2, 5, 0, + 2, 128, 2, 0, 15, 144, 9, 0, + 0, 3, 0, 0, 1, 128, 3, 0, +228, 160, 1, 0, 228, 144, 9, 0, + 0, 3, 0, 0, 2, 128, 4, 0, +228, 160, 1, 0, 228, 144, 2, 0, + 0, 3, 0, 0, 1, 128, 0, 0, + 85, 128, 0, 0, 0, 128, 5, 0, + 0, 3, 0, 0, 4, 192, 0, 0, + 0, 128, 5, 0, 0, 160, 9, 0, + 0, 3, 0, 0, 1, 128, 2, 0, +228, 160, 1, 0, 228, 144, 1, 0, + 0, 2, 1, 0, 2, 128, 0, 0, + 0, 129, 9, 0, 0, 3, 1, 0, + 1, 128, 1, 0, 228, 160, 1, 0, +228, 144, 4, 0, 0, 4, 0, 0, + 3, 192, 0, 0, 85, 128, 0, 0, +228, 160, 1, 0, 228, 128, 1, 0, + 0, 2, 0, 0, 8, 192, 0, 0, + 85, 128, 1, 0, 0, 2, 0, 0, + 15, 224, 0, 0, 228, 144, 1, 0, + 0, 2, 1, 0, 3, 224, 2, 0, +228, 144, 255, 255, 0, 0, 83, 72, + 68, 82, 124, 1, 0, 0, 64, 0, + 1, 0, 95, 0, 0, 0, 89, 0, + 0, 4, 70, 142, 32, 0, 0, 0, + 0, 0, 4, 0, 0, 0, 95, 0, + 0, 3, 242, 16, 16, 0, 0, 0, + 0, 0, 95, 0, 0, 3, 242, 16, + 16, 0, 1, 0, 0, 0, 95, 0, + 0, 3, 50, 16, 16, 0, 2, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, 101, 0, + 0, 3, 50, 32, 16, 0, 1, 0, + 0, 0, 103, 0, 0, 4, 242, 32, + 16, 0, 2, 0, 0, 0, 1, 0, + 0, 0, 104, 0, 0, 2, 1, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, 70, 30, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 50, 32, 16, 0, 1, 0, + 0, 0, 70, 16, 16, 0, 2, 0, + 0, 0, 17, 0, 0, 8, 18, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 54, 0, 0, 6, 34, 32, + 16, 0, 2, 0, 0, 0, 10, 0, + 16, 128, 65, 0, 0, 0, 0, 0, + 0, 0, 17, 0, 0, 8, 18, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 17, 0, 0, 8, 34, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 7, 18, 0, + 16, 0, 0, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 130, 32, 16, 0, 2, 0, + 0, 0, 26, 0, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 7, 66, 32, + 16, 0, 2, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 63, 17, 0, + 0, 8, 18, 32, 16, 0, 2, 0, + 0, 0, 70, 142, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 70, 30, + 16, 0, 1, 0, 0, 0, 62, 0, + 0, 1, 83, 84, 65, 84, 116, 0, + 0, 0, 11, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 6, 0, + 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 82, 68, + 69, 70, 204, 0, 0, 0, 1, 0, + 0, 0, 72, 0, 0, 0, 1, 0, + 0, 0, 28, 0, 0, 0, 0, 4, +254, 255, 0, 65, 0, 0, 152, 0, + 0, 0, 60, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 36, 71, 108, 111, 98, 97, +108, 115, 0, 171, 171, 171, 60, 0, + 0, 0, 1, 0, 0, 0, 96, 0, + 0, 0, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 120, 0, + 0, 0, 0, 0, 0, 0, 64, 0, + 0, 0, 2, 0, 0, 0, 136, 0, + 0, 0, 0, 0, 0, 0, 95, 67, + 67, 95, 77, 86, 80, 77, 97, 116, +114, 105, 120, 0, 171, 171, 3, 0, + 3, 0, 4, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 77, 105, + 99, 114, 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, 83, 76, + 32, 83, 104, 97, 100, 101, 114, 32, + 67, 111, 109, 112, 105, 108, 101, 114, + 32, 54, 46, 51, 46, 57, 54, 48, + 48, 46, 49, 54, 51, 56, 52, 0, +171, 171, 73, 83, 71, 78, 92, 0, + 0, 0, 3, 0, 0, 0, 8, 0, + 0, 0, 80, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 15, 15, + 0, 0, 80, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, 15, 15, + 0, 0, 80, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 2, 0, 0, 0, 3, 3, + 0, 0, 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, 79, 83, + 71, 78, 104, 0, 0, 0, 3, 0, + 0, 0, 8, 0, 0, 0, 80, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, 80, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 1, 0, + 0, 0, 3, 12, 0, 0, 89, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, 2, 0, + 0, 0, 15, 0, 0, 0, 84, 69, + 88, 67, 79, 79, 82, 68, 0, 83, + 86, 95, 80, 111, 115, 105, 116, 105, +111, 110, 0, 171, 171, 171, +}; + const unsigned char s_13E33F532157A58EC77EDE3B3112560A89D272B2[] = { 166, 147, 0, 0, 142, 9, 2, 1, @@ -78,7 +456,7 @@ const unsigned char s_13E33F532157A58EC77EDE3B3112560A89D272B2[] = { 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 164, 4, 0, 0, 0, 0, 0, 0, -212, 136, 0, 0, 0, 0, 0, 0, + 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, @@ -320,7 +698,1285 @@ const unsigned char s_13E33F532157A58EC77EDE3B3112560A89D272B2[] = { 116, 105, 111, 110, 0, 171, 171, 171, }; -const unsigned char s_4417BDCD87C486E7545CD55E0CB359CA4DBE59CC[] = { +const unsigned char s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 1, 0, + 0, 0, 82, 139, 0, 0, 7, 0, + 0, 0, 97, 95, 99, 111, 108, 111, +114, 0, 0, 0, 0, 80, 139, 0, + 0, 10, 0, 0, 0, 97, 95, 116, +101, 120, 67, 111, 111, 114, 100, 2, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 4, 0, 0, 0, 92, 139, 0, 0, +242, 141, 0, 0, 12, 0, 0, 0, + 67, 67, 95, 77, 86, 80, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 4, 0, 0, 0, 94, 139, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 0, + 67, 67, 95, 84, 101, 120, 116, 117, +114, 101, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 82, 139, 0, 0, 240, +141, 0, 0, 13, 0, 0, 0, 117, + 95, 101, 102, 102, 101, 99, 116, 67, +111, 108, 111, 114, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 82, 139, 0, 0, +240, 141, 0, 0, 11, 0, 0, 0, +117, 95, 116, 101, 120, 116, 67, 111, +108, 111, 114, 0, 0, 0, 0, 1, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 4, 0, 0, 0, 12, + 0, 0, 0, 67, 67, 95, 77, 86, + 80, 77, 97, 116, 114, 105, 120, 0, + 0, 0, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 67, 67, 95, 84, 101, +120, 116, 117, 114, 101, 48, 0, 0, + 0, 0, 1, 0, 0, 0, 13, 0, + 0, 0, 117, 95, 101, 102, 102, 101, + 99, 116, 67, 111, 108, 111, 114, 0, + 0, 0, 0, 2, 0, 0, 0, 11, + 0, 0, 0, 117, 95, 116, 101, 120, +116, 67, 111, 108, 111, 114, 0, 0, + 0, 0, 3, 0, 0, 0, 208, 7, + 0, 0, 4, 5, 0, 0, 0, 0, + 0, 0, 20, 134, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 68, 88, 66, 67, 65, 106, + 69, 173, 111, 248, 97, 165, 186, 90, + 40, 55, 215, 241, 97, 26, 1, 0, + 0, 0, 208, 7, 0, 0, 6, 0, + 0, 0, 56, 0, 0, 0, 56, 2, + 0, 0, 44, 5, 0, 0, 168, 5, + 0, 0, 8, 7, 0, 0, 84, 7, + 0, 0, 65, 111, 110, 57, 248, 1, + 0, 0, 248, 1, 0, 0, 0, 2, +255, 255, 196, 1, 0, 0, 52, 0, + 0, 0, 1, 0, 40, 0, 0, 0, + 52, 0, 0, 0, 52, 0, 1, 0, + 36, 0, 0, 0, 52, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 1, 2, +255, 255, 81, 0, 0, 5, 2, 0, + 15, 160, 31, 133, 235, 190, 254, 255, + 71, 65, 0, 0, 0, 192, 0, 0, + 64, 64, 81, 0, 0, 5, 3, 0, + 15, 160, 0, 0, 0, 191, 0, 0, +128, 63, 0, 0, 0, 0, 0, 0, + 0, 0, 31, 0, 0, 2, 0, 0, + 0, 128, 0, 0, 15, 176, 31, 0, + 0, 2, 0, 0, 0, 128, 1, 0, + 3, 176, 31, 0, 0, 2, 0, 0, + 0, 144, 0, 8, 15, 160, 66, 0, + 0, 3, 0, 0, 15, 128, 1, 0, +228, 176, 0, 8, 228, 160, 7, 0, + 0, 2, 0, 0, 1, 128, 0, 0, +255, 128, 2, 0, 0, 3, 0, 0, + 2, 128, 0, 0, 255, 128, 2, 0, + 0, 160, 5, 0, 0, 3, 0, 0, + 18, 128, 0, 0, 85, 128, 2, 0, + 85, 160, 6, 0, 0, 2, 0, 0, + 1, 128, 0, 0, 0, 128, 2, 0, + 0, 3, 0, 0, 1, 128, 0, 0, + 0, 128, 3, 0, 0, 160, 2, 0, + 0, 3, 0, 0, 17, 128, 0, 0, + 0, 128, 0, 0, 0, 128, 4, 0, + 0, 4, 0, 0, 4, 128, 0, 0, + 0, 128, 2, 0, 170, 160, 2, 0, +255, 160, 5, 0, 0, 3, 0, 0, + 1, 128, 0, 0, 0, 128, 0, 0, + 0, 128, 5, 0, 0, 3, 0, 0, + 1, 128, 0, 0, 0, 128, 0, 0, +170, 128, 4, 0, 0, 4, 0, 0, + 4, 128, 0, 0, 85, 128, 2, 0, +170, 160, 2, 0, 255, 160, 5, 0, + 0, 3, 0, 0, 2, 128, 0, 0, + 85, 128, 0, 0, 85, 128, 5, 0, + 0, 3, 0, 0, 8, 128, 0, 0, + 85, 128, 0, 0, 170, 128, 4, 0, + 0, 4, 0, 0, 2, 128, 0, 0, +170, 128, 0, 0, 85, 129, 3, 0, + 85, 160, 11, 0, 0, 3, 1, 0, + 8, 128, 0, 0, 255, 128, 0, 0, + 0, 128, 5, 0, 0, 3, 2, 0, + 15, 128, 0, 0, 255, 128, 1, 0, +228, 160, 4, 0, 0, 4, 0, 0, + 15, 128, 0, 0, 228, 160, 0, 0, + 85, 128, 2, 0, 228, 128, 5, 0, + 0, 3, 0, 0, 8, 128, 0, 0, +255, 128, 1, 0, 255, 128, 5, 0, + 0, 3, 0, 0, 15, 128, 0, 0, +228, 128, 0, 0, 228, 176, 1, 0, + 0, 2, 0, 8, 15, 128, 0, 0, +228, 128, 1, 0, 0, 2, 1, 8, + 15, 128, 0, 0, 228, 128, 1, 0, + 0, 2, 2, 8, 15, 128, 0, 0, +228, 128, 1, 0, 0, 2, 3, 8, + 15, 128, 0, 0, 228, 128, 255, 255, + 0, 0, 83, 72, 68, 82, 236, 2, + 0, 0, 64, 0, 0, 0, 187, 0, + 0, 0, 89, 0, 0, 4, 70, 142, + 32, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, 98, 16, + 0, 3, 242, 16, 16, 0, 0, 0, + 0, 0, 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 0, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 2, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 3, 0, 0, 0, 104, 0, + 0, 2, 2, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, 0, 0, + 0, 0, 75, 0, 0, 5, 18, 0, + 16, 0, 0, 0, 0, 0, 58, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 10, 50, 0, 16, 0, 0, 0, + 0, 0, 198, 0, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, 0, 0, + 0, 191, 31, 133, 235, 190, 0, 0, + 0, 0, 0, 0, 0, 0, 56, 32, + 0, 7, 34, 0, 16, 0, 0, 0, + 0, 0, 26, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, 254, 255, + 71, 65, 0, 32, 0, 7, 18, 0, + 16, 0, 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 50, 0, + 0, 9, 66, 0, 16, 0, 0, 0, + 0, 0, 10, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, 0, 0, + 0, 192, 1, 64, 0, 0, 0, 0, + 64, 64, 56, 0, 0, 7, 18, 0, + 16, 0, 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 56, 0, + 0, 7, 18, 0, 16, 0, 0, 0, + 0, 0, 10, 0, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, 0, 0, + 0, 0, 50, 0, 0, 9, 66, 0, + 16, 0, 0, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 192, 1, 64, + 0, 0, 0, 0, 64, 64, 56, 0, + 0, 7, 34, 0, 16, 0, 0, 0, + 0, 0, 26, 0, 16, 0, 0, 0, + 0, 0, 26, 0, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 7, 130, 0, + 16, 0, 0, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, 42, 0, + 16, 0, 0, 0, 0, 0, 50, 0, + 0, 10, 34, 0, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 128, 65, 0, + 0, 0, 0, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 128, 63, 52, 0, + 0, 7, 18, 0, 16, 0, 0, 0, + 0, 0, 10, 0, 16, 0, 0, 0, + 0, 0, 58, 0, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 8, 242, 0, + 16, 0, 1, 0, 0, 0, 246, 15, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 50, 0, 0, 10, 242, 0, + 16, 0, 1, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 86, 5, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, 1, 0, + 0, 0, 56, 0, 0, 7, 130, 0, + 16, 0, 1, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 58, 0, + 16, 0, 1, 0, 0, 0, 56, 0, + 0, 7, 242, 0, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, 1, 0, + 0, 0, 70, 30, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 2, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, 3, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, 83, 84, + 65, 84, 116, 0, 0, 0, 22, 0, + 0, 0, 2, 0, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, 16, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 82, 68, 69, 70, 88, 1, + 0, 0, 1, 0, 0, 0, 176, 0, + 0, 0, 3, 0, 0, 0, 28, 0, + 0, 0, 0, 4, 255, 255, 0, 65, + 0, 0, 37, 1, 0, 0, 124, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, 145, 0, + 0, 0, 2, 0, 0, 0, 5, 0, + 0, 0, 4, 0, 0, 0, 255, 255, +255, 255, 0, 0, 0, 0, 1, 0, + 0, 0, 13, 0, 0, 0, 166, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 115, 97, +109, 112, 108, 101, 114, 95, 95, 67, + 67, 95, 84, 101, 120, 116, 117, 114, +101, 48, 0, 116, 101, 120, 116, 117, +114, 101, 95, 95, 67, 67, 95, 84, +101, 120, 116, 117, 114, 101, 48, 0, + 36, 71, 108, 111, 98, 97, 108, 115, + 0, 171, 166, 0, 0, 0, 2, 0, + 0, 0, 200, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 248, 0, 0, 0, 0, 0, + 0, 0, 16, 0, 0, 0, 2, 0, + 0, 0, 8, 1, 0, 0, 0, 0, + 0, 0, 24, 1, 0, 0, 16, 0, + 0, 0, 16, 0, 0, 0, 2, 0, + 0, 0, 8, 1, 0, 0, 0, 0, + 0, 0, 95, 117, 95, 101, 102, 102, +101, 99, 116, 67, 111, 108, 111, 114, + 0, 171, 1, 0, 3, 0, 1, 0, + 4, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 95, 117, 95, 116, 101, 120, +116, 67, 111, 108, 111, 114, 0, 77, +105, 99, 114, 111, 115, 111, 102, 116, + 32, 40, 82, 41, 32, 72, 76, 83, + 76, 32, 83, 104, 97, 100, 101, 114, + 32, 67, 111, 109, 112, 105, 108, 101, +114, 32, 54, 46, 51, 46, 57, 54, + 48, 48, 46, 49, 54, 51, 56, 52, + 0, 171, 73, 83, 71, 78, 68, 0, + 0, 0, 2, 0, 0, 0, 8, 0, + 0, 0, 56, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 15, 15, + 0, 0, 56, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, 3, 3, + 0, 0, 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, 79, 83, + 71, 78, 116, 0, 0, 0, 4, 0, + 0, 0, 8, 0, 0, 0, 104, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 1, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 2, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 2, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 3, 0, + 0, 0, 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, 116, 0, +171, 171, 68, 88, 66, 67, 235, 56, +180, 223, 125, 231, 231, 218, 70, 75, + 12, 63, 200, 233, 69, 121, 1, 0, + 0, 0, 4, 5, 0, 0, 6, 0, + 0, 0, 56, 0, 0, 0, 92, 1, + 0, 0, 224, 2, 0, 0, 92, 3, + 0, 0, 48, 4, 0, 0, 148, 4, + 0, 0, 65, 111, 110, 57, 28, 1, + 0, 0, 28, 1, 0, 0, 0, 2, +254, 255, 232, 0, 0, 0, 52, 0, + 0, 0, 1, 0, 36, 0, 0, 0, + 48, 0, 0, 0, 48, 0, 0, 0, + 36, 0, 1, 0, 48, 0, 0, 0, + 0, 0, 4, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 2, +254, 255, 81, 0, 0, 5, 5, 0, + 15, 160, 0, 0, 0, 63, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 31, 0, 0, 2, 5, 0, + 0, 128, 0, 0, 15, 144, 31, 0, + 0, 2, 5, 0, 1, 128, 1, 0, + 15, 144, 31, 0, 0, 2, 5, 0, + 2, 128, 2, 0, 15, 144, 9, 0, + 0, 3, 0, 0, 1, 128, 3, 0, +228, 160, 1, 0, 228, 144, 9, 0, + 0, 3, 0, 0, 2, 128, 4, 0, +228, 160, 1, 0, 228, 144, 2, 0, + 0, 3, 0, 0, 1, 128, 0, 0, + 85, 128, 0, 0, 0, 128, 5, 0, + 0, 3, 0, 0, 4, 192, 0, 0, + 0, 128, 5, 0, 0, 160, 9, 0, + 0, 3, 0, 0, 1, 128, 2, 0, +228, 160, 1, 0, 228, 144, 1, 0, + 0, 2, 1, 0, 2, 128, 0, 0, + 0, 129, 9, 0, 0, 3, 1, 0, + 1, 128, 1, 0, 228, 160, 1, 0, +228, 144, 4, 0, 0, 4, 0, 0, + 3, 192, 0, 0, 85, 128, 0, 0, +228, 160, 1, 0, 228, 128, 1, 0, + 0, 2, 0, 0, 8, 192, 0, 0, + 85, 128, 1, 0, 0, 2, 0, 0, + 15, 224, 0, 0, 228, 144, 1, 0, + 0, 2, 1, 0, 3, 224, 2, 0, +228, 144, 255, 255, 0, 0, 83, 72, + 68, 82, 124, 1, 0, 0, 64, 0, + 1, 0, 95, 0, 0, 0, 89, 0, + 0, 4, 70, 142, 32, 0, 0, 0, + 0, 0, 4, 0, 0, 0, 95, 0, + 0, 3, 242, 16, 16, 0, 0, 0, + 0, 0, 95, 0, 0, 3, 242, 16, + 16, 0, 1, 0, 0, 0, 95, 0, + 0, 3, 50, 16, 16, 0, 2, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, 101, 0, + 0, 3, 50, 32, 16, 0, 1, 0, + 0, 0, 103, 0, 0, 4, 242, 32, + 16, 0, 2, 0, 0, 0, 1, 0, + 0, 0, 104, 0, 0, 2, 1, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, 70, 30, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 50, 32, 16, 0, 1, 0, + 0, 0, 70, 16, 16, 0, 2, 0, + 0, 0, 17, 0, 0, 8, 18, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 54, 0, 0, 6, 34, 32, + 16, 0, 2, 0, 0, 0, 10, 0, + 16, 128, 65, 0, 0, 0, 0, 0, + 0, 0, 17, 0, 0, 8, 18, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 17, 0, 0, 8, 34, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 7, 18, 0, + 16, 0, 0, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 130, 32, 16, 0, 2, 0, + 0, 0, 26, 0, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 7, 66, 32, + 16, 0, 2, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 63, 17, 0, + 0, 8, 18, 32, 16, 0, 2, 0, + 0, 0, 70, 142, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 70, 30, + 16, 0, 1, 0, 0, 0, 62, 0, + 0, 1, 83, 84, 65, 84, 116, 0, + 0, 0, 11, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 6, 0, + 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 82, 68, + 69, 70, 204, 0, 0, 0, 1, 0, + 0, 0, 72, 0, 0, 0, 1, 0, + 0, 0, 28, 0, 0, 0, 0, 4, +254, 255, 0, 65, 0, 0, 152, 0, + 0, 0, 60, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 36, 71, 108, 111, 98, 97, +108, 115, 0, 171, 171, 171, 60, 0, + 0, 0, 1, 0, 0, 0, 96, 0, + 0, 0, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 120, 0, + 0, 0, 0, 0, 0, 0, 64, 0, + 0, 0, 2, 0, 0, 0, 136, 0, + 0, 0, 0, 0, 0, 0, 95, 67, + 67, 95, 77, 86, 80, 77, 97, 116, +114, 105, 120, 0, 171, 171, 3, 0, + 3, 0, 4, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 77, 105, + 99, 114, 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, 83, 76, + 32, 83, 104, 97, 100, 101, 114, 32, + 67, 111, 109, 112, 105, 108, 101, 114, + 32, 54, 46, 51, 46, 57, 54, 48, + 48, 46, 49, 54, 51, 56, 52, 0, +171, 171, 73, 83, 71, 78, 92, 0, + 0, 0, 3, 0, 0, 0, 8, 0, + 0, 0, 80, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 15, 15, + 0, 0, 80, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, 15, 15, + 0, 0, 80, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 2, 0, 0, 0, 3, 3, + 0, 0, 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, 79, 83, + 71, 78, 104, 0, 0, 0, 3, 0, + 0, 0, 8, 0, 0, 0, 80, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, 80, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 1, 0, + 0, 0, 3, 12, 0, 0, 89, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, 2, 0, + 0, 0, 15, 0, 0, 0, 84, 69, + 88, 67, 79, 79, 82, 68, 0, 83, + 86, 95, 80, 111, 115, 105, 116, 105, +111, 110, 0, 171, 171, 171, +}; + +const unsigned char s_53938AB67AD93ABA0DDB87F3C9889304284E011E[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 1, 0, + 0, 0, 82, 139, 0, 0, 7, 0, + 0, 0, 97, 95, 99, 111, 108, 111, +114, 0, 0, 0, 0, 80, 139, 0, + 0, 10, 0, 0, 0, 97, 95, 116, +101, 120, 67, 111, 111, 114, 100, 2, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 2, 0, 0, 0, 92, 139, 0, 0, +242, 141, 0, 0, 12, 0, 0, 0, + 67, 67, 95, 77, 86, 80, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 4, 0, 0, 0, 94, 139, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 0, + 67, 67, 95, 84, 101, 120, 116, 117, +114, 101, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 2, 0, 0, 0, 12, + 0, 0, 0, 67, 67, 95, 77, 86, + 80, 77, 97, 116, 114, 105, 120, 0, + 0, 0, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 67, 67, 95, 84, 101, +120, 116, 117, 114, 101, 48, 0, 0, + 0, 0, 1, 0, 0, 0, 24, 4, + 0, 0, 4, 5, 0, 0, 0, 0, + 0, 0, 20, 134, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 68, 88, 66, 67, 200, 5, +103, 205, 248, 30, 69, 65, 32, 117, + 98, 148, 123, 240, 193, 101, 1, 0, + 0, 0, 24, 4, 0, 0, 6, 0, + 0, 0, 56, 0, 0, 0, 240, 0, + 0, 0, 20, 2, 0, 0, 144, 2, + 0, 0, 80, 3, 0, 0, 156, 3, + 0, 0, 65, 111, 110, 57, 176, 0, + 0, 0, 176, 0, 0, 0, 0, 2, +255, 255, 136, 0, 0, 0, 40, 0, + 0, 0, 0, 0, 40, 0, 0, 0, + 40, 0, 0, 0, 40, 0, 1, 0, + 36, 0, 0, 0, 40, 0, 0, 0, + 0, 0, 1, 2, 255, 255, 31, 0, + 0, 2, 0, 0, 0, 128, 0, 0, + 15, 176, 31, 0, 0, 2, 0, 0, + 0, 128, 1, 0, 3, 176, 31, 0, + 0, 2, 0, 0, 0, 144, 0, 8, + 15, 160, 66, 0, 0, 3, 0, 0, + 15, 128, 1, 0, 228, 176, 0, 8, +228, 160, 5, 0, 0, 3, 0, 0, + 8, 128, 0, 0, 255, 128, 0, 0, +255, 176, 1, 0, 0, 2, 0, 0, + 7, 128, 0, 0, 228, 176, 1, 0, + 0, 2, 0, 8, 15, 128, 0, 0, +228, 128, 1, 0, 0, 2, 1, 8, + 15, 128, 0, 0, 228, 128, 1, 0, + 0, 2, 2, 8, 15, 128, 0, 0, +228, 128, 1, 0, 0, 2, 3, 8, + 15, 128, 0, 0, 228, 128, 255, 255, + 0, 0, 83, 72, 68, 82, 28, 1, + 0, 0, 64, 0, 0, 0, 71, 0, + 0, 0, 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, 98, 16, + 0, 3, 242, 16, 16, 0, 0, 0, + 0, 0, 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 0, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 2, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 3, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 7, 130, 0, + 16, 0, 0, 0, 0, 0, 58, 0, + 16, 0, 0, 0, 0, 0, 58, 16, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 114, 0, 16, 0, 0, 0, + 0, 0, 70, 18, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 2, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, 3, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, 83, 84, + 65, 84, 116, 0, 0, 0, 8, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 82, 68, 69, 70, 184, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 28, 0, + 0, 0, 0, 4, 255, 255, 0, 65, + 0, 0, 134, 0, 0, 0, 92, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, 113, 0, + 0, 0, 2, 0, 0, 0, 5, 0, + 0, 0, 4, 0, 0, 0, 255, 255, +255, 255, 0, 0, 0, 0, 1, 0, + 0, 0, 13, 0, 0, 0, 115, 97, +109, 112, 108, 101, 114, 95, 95, 67, + 67, 95, 84, 101, 120, 116, 117, 114, +101, 48, 0, 116, 101, 120, 116, 117, +114, 101, 95, 95, 67, 67, 95, 84, +101, 120, 116, 117, 114, 101, 48, 0, + 77, 105, 99, 114, 111, 115, 111, 102, +116, 32, 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, 100, 101, +114, 32, 67, 111, 109, 112, 105, 108, +101, 114, 32, 54, 46, 51, 46, 57, + 54, 48, 48, 46, 49, 54, 51, 56, + 52, 0, 73, 83, 71, 78, 68, 0, + 0, 0, 2, 0, 0, 0, 8, 0, + 0, 0, 56, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 15, 15, + 0, 0, 56, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, 3, 3, + 0, 0, 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, 79, 83, + 71, 78, 116, 0, 0, 0, 4, 0, + 0, 0, 8, 0, 0, 0, 104, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 1, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 2, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 2, 0, + 0, 0, 15, 0, 0, 0, 104, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 3, 0, + 0, 0, 15, 0, 0, 0, 83, 86, + 95, 84, 97, 114, 103, 101, 116, 0, +171, 171, 68, 88, 66, 67, 235, 56, +180, 223, 125, 231, 231, 218, 70, 75, + 12, 63, 200, 233, 69, 121, 1, 0, + 0, 0, 4, 5, 0, 0, 6, 0, + 0, 0, 56, 0, 0, 0, 92, 1, + 0, 0, 224, 2, 0, 0, 92, 3, + 0, 0, 48, 4, 0, 0, 148, 4, + 0, 0, 65, 111, 110, 57, 28, 1, + 0, 0, 28, 1, 0, 0, 0, 2, +254, 255, 232, 0, 0, 0, 52, 0, + 0, 0, 1, 0, 36, 0, 0, 0, + 48, 0, 0, 0, 48, 0, 0, 0, + 36, 0, 1, 0, 48, 0, 0, 0, + 0, 0, 4, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 2, +254, 255, 81, 0, 0, 5, 5, 0, + 15, 160, 0, 0, 0, 63, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 31, 0, 0, 2, 5, 0, + 0, 128, 0, 0, 15, 144, 31, 0, + 0, 2, 5, 0, 1, 128, 1, 0, + 15, 144, 31, 0, 0, 2, 5, 0, + 2, 128, 2, 0, 15, 144, 9, 0, + 0, 3, 0, 0, 1, 128, 3, 0, +228, 160, 1, 0, 228, 144, 9, 0, + 0, 3, 0, 0, 2, 128, 4, 0, +228, 160, 1, 0, 228, 144, 2, 0, + 0, 3, 0, 0, 1, 128, 0, 0, + 85, 128, 0, 0, 0, 128, 5, 0, + 0, 3, 0, 0, 4, 192, 0, 0, + 0, 128, 5, 0, 0, 160, 9, 0, + 0, 3, 0, 0, 1, 128, 2, 0, +228, 160, 1, 0, 228, 144, 1, 0, + 0, 2, 1, 0, 2, 128, 0, 0, + 0, 129, 9, 0, 0, 3, 1, 0, + 1, 128, 1, 0, 228, 160, 1, 0, +228, 144, 4, 0, 0, 4, 0, 0, + 3, 192, 0, 0, 85, 128, 0, 0, +228, 160, 1, 0, 228, 128, 1, 0, + 0, 2, 0, 0, 8, 192, 0, 0, + 85, 128, 1, 0, 0, 2, 0, 0, + 15, 224, 0, 0, 228, 144, 1, 0, + 0, 2, 1, 0, 3, 224, 2, 0, +228, 144, 255, 255, 0, 0, 83, 72, + 68, 82, 124, 1, 0, 0, 64, 0, + 1, 0, 95, 0, 0, 0, 89, 0, + 0, 4, 70, 142, 32, 0, 0, 0, + 0, 0, 4, 0, 0, 0, 95, 0, + 0, 3, 242, 16, 16, 0, 0, 0, + 0, 0, 95, 0, 0, 3, 242, 16, + 16, 0, 1, 0, 0, 0, 95, 0, + 0, 3, 50, 16, 16, 0, 2, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, 101, 0, + 0, 3, 50, 32, 16, 0, 1, 0, + 0, 0, 103, 0, 0, 4, 242, 32, + 16, 0, 2, 0, 0, 0, 1, 0, + 0, 0, 104, 0, 0, 2, 1, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 0, 0, 0, 0, 70, 30, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 50, 32, 16, 0, 1, 0, + 0, 0, 70, 16, 16, 0, 2, 0, + 0, 0, 17, 0, 0, 8, 18, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 54, 0, 0, 6, 34, 32, + 16, 0, 2, 0, 0, 0, 10, 0, + 16, 128, 65, 0, 0, 0, 0, 0, + 0, 0, 17, 0, 0, 8, 18, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 17, 0, 0, 8, 34, 0, + 16, 0, 0, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 0, 0, 0, 7, 18, 0, + 16, 0, 0, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 54, 0, + 0, 5, 130, 32, 16, 0, 2, 0, + 0, 0, 26, 0, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 7, 66, 32, + 16, 0, 2, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 63, 17, 0, + 0, 8, 18, 32, 16, 0, 2, 0, + 0, 0, 70, 142, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 70, 30, + 16, 0, 1, 0, 0, 0, 62, 0, + 0, 1, 83, 84, 65, 84, 116, 0, + 0, 0, 11, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 6, 0, + 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 82, 68, + 69, 70, 204, 0, 0, 0, 1, 0, + 0, 0, 72, 0, 0, 0, 1, 0, + 0, 0, 28, 0, 0, 0, 0, 4, +254, 255, 0, 65, 0, 0, 152, 0, + 0, 0, 60, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 36, 71, 108, 111, 98, 97, +108, 115, 0, 171, 171, 171, 60, 0, + 0, 0, 1, 0, 0, 0, 96, 0, + 0, 0, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 120, 0, + 0, 0, 0, 0, 0, 0, 64, 0, + 0, 0, 2, 0, 0, 0, 136, 0, + 0, 0, 0, 0, 0, 0, 95, 67, + 67, 95, 77, 86, 80, 77, 97, 116, +114, 105, 120, 0, 171, 171, 3, 0, + 3, 0, 4, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 77, 105, + 99, 114, 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, 83, 76, + 32, 83, 104, 97, 100, 101, 114, 32, + 67, 111, 109, 112, 105, 108, 101, 114, + 32, 54, 46, 51, 46, 57, 54, 48, + 48, 46, 49, 54, 51, 56, 52, 0, +171, 171, 73, 83, 71, 78, 92, 0, + 0, 0, 3, 0, 0, 0, 8, 0, + 0, 0, 80, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 15, 15, + 0, 0, 80, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, 15, 15, + 0, 0, 80, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 2, 0, 0, 0, 3, 3, + 0, 0, 84, 69, 88, 67, 79, 79, + 82, 68, 0, 171, 171, 171, 79, 83, + 71, 78, 104, 0, 0, 0, 3, 0, + 0, 0, 8, 0, 0, 0, 80, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, 80, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 1, 0, + 0, 0, 3, 12, 0, 0, 89, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, 2, 0, + 0, 0, 15, 0, 0, 0, 84, 69, + 88, 67, 79, 79, 82, 68, 0, 83, + 86, 95, 80, 111, 115, 105, 116, 105, +111, 110, 0, 171, 171, 171, +}; + +const unsigned char s_67837675F2BB48C0E926316F505FC1538228E0FA[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 1, 0, + 0, 0, 82, 139, 0, 0, 7, 0, + 0, 0, 97, 95, 99, 111, 108, 111, +114, 0, 0, 0, 0, 80, 139, 0, + 0, 10, 0, 0, 0, 97, 95, 116, +101, 120, 99, 111, 111, 114, 100, 2, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 92, 139, 0, 0, +242, 141, 0, 0, 12, 0, 0, 0, + 67, 67, 95, 77, 86, 80, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 4, 0, 0, 0, 1, 0, 0, 0, + 12, 0, 0, 0, 67, 67, 95, 77, + 86, 80, 77, 97, 116, 114, 105, 120, + 0, 0, 0, 0, 0, 0, 0, 0, + 16, 4, 0, 0, 48, 5, 0, 0, + 0, 0, 0, 0, 20, 134, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 68, 88, 66, 67, + 79, 226, 72, 124, 94, 252, 37, 157, +186, 66, 253, 29, 176, 252, 8, 124, + 1, 0, 0, 0, 16, 4, 0, 0, + 6, 0, 0, 0, 56, 0, 0, 0, + 28, 1, 0, 0, 116, 2, 0, 0, +240, 2, 0, 0, 72, 3, 0, 0, +148, 3, 0, 0, 65, 111, 110, 57, +220, 0, 0, 0, 220, 0, 0, 0, + 0, 2, 255, 255, 184, 0, 0, 0, + 36, 0, 0, 0, 0, 0, 36, 0, + 0, 0, 36, 0, 0, 0, 36, 0, + 0, 0, 36, 0, 0, 0, 36, 0, + 1, 2, 255, 255, 81, 0, 0, 5, + 0, 0, 15, 160, 0, 0, 0, 0, + 0, 0, 128, 63, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 2, + 0, 0, 0, 128, 0, 0, 15, 176, + 31, 0, 0, 2, 0, 0, 0, 128, + 1, 0, 3, 176, 90, 0, 0, 4, + 0, 0, 8, 128, 1, 0, 228, 176, + 1, 0, 228, 176, 0, 0, 0, 160, + 7, 0, 0, 2, 0, 0, 1, 128, + 0, 0, 255, 128, 6, 0, 0, 2, + 0, 0, 1, 128, 0, 0, 0, 128, + 2, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 0, 129, 0, 0, 85, 160, + 88, 0, 0, 4, 0, 0, 15, 128, + 0, 0, 0, 128, 0, 0, 228, 176, + 0, 0, 0, 160, 1, 0, 0, 2, + 0, 8, 15, 128, 0, 0, 228, 128, + 1, 0, 0, 2, 1, 8, 15, 128, + 0, 0, 228, 128, 1, 0, 0, 2, + 2, 8, 15, 128, 0, 0, 228, 128, + 1, 0, 0, 2, 3, 8, 15, 128, + 0, 0, 228, 128, 255, 255, 0, 0, + 83, 72, 68, 82, 80, 1, 0, 0, + 64, 0, 0, 0, 84, 0, 0, 0, + 98, 16, 0, 3, 242, 16, 16, 0, + 0, 0, 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 101, 0, 0, 3, +242, 32, 16, 0, 1, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 2, 0, 0, 0, 101, 0, 0, 3, +242, 32, 16, 0, 3, 0, 0, 0, +104, 0, 0, 2, 1, 0, 0, 0, + 15, 0, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 75, 0, 0, 5, + 18, 0, 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, 0, 0, + 0, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 128, + 65, 0, 0, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, 128, 63, + 29, 0, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 1, 64, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 7, + 18, 0, 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, 128, 63, + 56, 0, 0, 7, 242, 0, 16, 0, + 0, 0, 0, 0, 6, 0, 16, 0, + 0, 0, 0, 0, 70, 30, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +242, 32, 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 1, 0, 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +242, 32, 16, 0, 2, 0, 0, 0, + 70, 14, 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 3, 0, 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, 0, 0, + 11, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, + 5, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 82, 68, 69, 70, + 80, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 28, 0, 0, 0, 0, 4, 255, 255, + 0, 65, 0, 0, 28, 0, 0, 0, + 77, 105, 99, 114, 111, 115, 111, 102, +116, 32, 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, 100, 101, +114, 32, 67, 111, 109, 112, 105, 108, +101, 114, 32, 54, 46, 51, 46, 57, + 54, 48, 48, 46, 49, 54, 51, 56, + 52, 0, 171, 171, 73, 83, 71, 78, + 68, 0, 0, 0, 2, 0, 0, 0, + 8, 0, 0, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 15, 15, 0, 0, 56, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, 0, 0, + 3, 3, 0, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 171, 171, 171, + 79, 83, 71, 78, 116, 0, 0, 0, + 4, 0, 0, 0, 8, 0, 0, 0, +104, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, 0, 0, +104, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 15, 0, 0, 0, +104, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 15, 0, 0, 0, +104, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 15, 0, 0, 0, + 83, 86, 95, 84, 97, 114, 103, 101, +116, 0, 171, 171, 68, 88, 66, 67, +171, 76, 90, 152, 95, 120, 80, 155, +185, 88, 30, 71, 14, 112, 82, 161, + 1, 0, 0, 0, 48, 5, 0, 0, + 6, 0, 0, 0, 56, 0, 0, 0, +108, 1, 0, 0, 12, 3, 0, 0, +136, 3, 0, 0, 92, 4, 0, 0, +192, 4, 0, 0, 65, 111, 110, 57, + 44, 1, 0, 0, 44, 1, 0, 0, + 0, 2, 254, 255, 248, 0, 0, 0, + 52, 0, 0, 0, 1, 0, 36, 0, + 0, 0, 48, 0, 0, 0, 48, 0, + 0, 0, 36, 0, 1, 0, 48, 0, + 0, 0, 0, 0, 4, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 254, 255, 81, 0, 0, 5, + 5, 0, 15, 160, 0, 0, 0, 63, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, 0, 2, + 5, 0, 0, 128, 0, 0, 15, 144, + 31, 0, 0, 2, 5, 0, 1, 128, + 1, 0, 15, 144, 31, 0, 0, 2, + 5, 0, 2, 128, 2, 0, 15, 144, + 5, 0, 0, 3, 0, 0, 7, 224, + 0, 0, 255, 144, 0, 0, 228, 144, + 9, 0, 0, 3, 0, 0, 1, 128, + 3, 0, 228, 160, 1, 0, 228, 144, + 9, 0, 0, 3, 0, 0, 2, 128, + 4, 0, 228, 160, 1, 0, 228, 144, + 2, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 85, 128, 0, 0, 0, 128, + 5, 0, 0, 3, 0, 0, 4, 192, + 0, 0, 0, 128, 5, 0, 0, 160, + 9, 0, 0, 3, 0, 0, 1, 128, + 2, 0, 228, 160, 1, 0, 228, 144, + 1, 0, 0, 2, 1, 0, 2, 128, + 0, 0, 0, 129, 9, 0, 0, 3, + 1, 0, 1, 128, 1, 0, 228, 160, + 1, 0, 228, 144, 4, 0, 0, 4, + 0, 0, 3, 192, 0, 0, 85, 128, + 0, 0, 228, 160, 1, 0, 228, 128, + 1, 0, 0, 2, 0, 0, 8, 192, + 0, 0, 85, 128, 1, 0, 0, 2, + 0, 0, 8, 224, 0, 0, 255, 144, + 1, 0, 0, 2, 1, 0, 3, 224, + 2, 0, 228, 144, 255, 255, 0, 0, + 83, 72, 68, 82, 152, 1, 0, 0, + 64, 0, 1, 0, 102, 0, 0, 0, + 89, 0, 0, 4, 70, 142, 32, 0, + 0, 0, 0, 0, 4, 0, 0, 0, + 95, 0, 0, 3, 242, 16, 16, 0, + 0, 0, 0, 0, 95, 0, 0, 3, +242, 16, 16, 0, 1, 0, 0, 0, + 95, 0, 0, 3, 50, 16, 16, 0, + 2, 0, 0, 0, 101, 0, 0, 3, +242, 32, 16, 0, 0, 0, 0, 0, +101, 0, 0, 3, 50, 32, 16, 0, + 1, 0, 0, 0, 103, 0, 0, 4, +242, 32, 16, 0, 2, 0, 0, 0, + 1, 0, 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 56, 0, 0, 7, +114, 32, 16, 0, 0, 0, 0, 0, +246, 31, 16, 0, 0, 0, 0, 0, + 70, 18, 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 130, 32, 16, 0, + 0, 0, 0, 0, 58, 16, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, + 50, 32, 16, 0, 1, 0, 0, 0, + 70, 16, 16, 0, 2, 0, 0, 0, + 17, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 54, 0, 0, 6, 34, 32, 16, 0, + 2, 0, 0, 0, 10, 0, 16, 128, + 65, 0, 0, 0, 0, 0, 0, 0, + 17, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 2, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 17, 0, 0, 8, 34, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 0, 0, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 26, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +130, 32, 16, 0, 2, 0, 0, 0, + 26, 0, 16, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 66, 32, 16, 0, + 2, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 1, 64, 0, 0, + 0, 0, 0, 63, 17, 0, 0, 8, + 18, 32, 16, 0, 2, 0, 0, 0, + 70, 142, 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 70, 30, 16, 0, + 1, 0, 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, 0, 0, + 12, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, + 8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 82, 68, 69, 70, +204, 0, 0, 0, 1, 0, 0, 0, + 72, 0, 0, 0, 1, 0, 0, 0, + 28, 0, 0, 0, 0, 4, 254, 255, + 0, 65, 0, 0, 152, 0, 0, 0, + 60, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 36, 71, 108, 111, 98, 97, 108, 115, + 0, 171, 171, 171, 60, 0, 0, 0, + 1, 0, 0, 0, 96, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 120, 0, 0, 0, + 0, 0, 0, 0, 64, 0, 0, 0, + 2, 0, 0, 0, 136, 0, 0, 0, + 0, 0, 0, 0, 95, 67, 67, 95, + 77, 86, 80, 77, 97, 116, 114, 105, +120, 0, 171, 171, 3, 0, 3, 0, + 4, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 77, 105, 99, 114, +111, 115, 111, 102, 116, 32, 40, 82, + 41, 32, 72, 76, 83, 76, 32, 83, +104, 97, 100, 101, 114, 32, 67, 111, +109, 112, 105, 108, 101, 114, 32, 54, + 46, 51, 46, 57, 54, 48, 48, 46, + 49, 54, 51, 56, 52, 0, 171, 171, + 73, 83, 71, 78, 92, 0, 0, 0, + 3, 0, 0, 0, 8, 0, 0, 0, + 80, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 15, 0, 0, + 80, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 15, 15, 0, 0, + 80, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 3, 3, 0, 0, + 84, 69, 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, 71, 78, +104, 0, 0, 0, 3, 0, 0, 0, + 8, 0, 0, 0, 80, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 80, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, 0, 0, + 3, 12, 0, 0, 89, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 2, 0, 0, 0, + 15, 0, 0, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 83, 86, 95, + 80, 111, 115, 105, 116, 105, 111, 110, + 0, 171, 171, 171, +}; + +const unsigned char s_78250E25D1929D4A842050738140787BE42541C6[] = { 166, 147, 0, 0, 142, 9, 2, 1, 0, 128, 0, 0, 82, 139, 0, 0, @@ -414,7 +2070,7 @@ const unsigned char s_4417BDCD87C486E7545CD55E0CB359CA4DBE59CC[] = { 108, 112, 104, 97, 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 4, 5, - 0, 0, 0, 0, 0, 0, 212, 136, + 0, 0, 0, 0, 0, 0, 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, @@ -744,1703 +2400,7 @@ const unsigned char s_4417BDCD87C486E7545CD55E0CB359CA4DBE59CC[] = { 111, 110, 0, 171, 171, 171, }; -const unsigned char s_4D8C5651F1F40F9A6F86BCF92EAC1F807C8B7EBD[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 255, 255, 255, 255, 80, 139, - 0, 0, 10, 0, 0, 0, 97, 95, -116, 101, 120, 67, 111, 111, 114, 100, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 2, 0, 0, 0, 92, 139, 0, - 0, 242, 141, 0, 0, 12, 0, 0, - 0, 67, 67, 95, 77, 86, 80, 77, - 97, 116, 114, 105, 120, 0, 0, 0, - 0, 255, 255, 255, 255, 0, 0, 0, - 0, 4, 0, 0, 0, 94, 139, 0, - 0, 0, 0, 0, 0, 11, 0, 0, - 0, 67, 67, 95, 84, 101, 120, 116, -117, 114, 101, 48, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 2, 0, 0, 0, - 12, 0, 0, 0, 67, 67, 95, 77, - 86, 80, 77, 97, 116, 114, 105, 120, - 0, 0, 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 67, 67, 95, 84, -101, 120, 116, 117, 114, 101, 48, 0, - 0, 0, 0, 1, 0, 0, 0, 156, - 3, 0, 0, 144, 4, 0, 0, 0, - 0, 0, 0, 212, 136, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 68, 88, 66, 67, 203, -117, 183, 110, 154, 52, 220, 70, 125, -228, 9, 112, 112, 45, 175, 213, 1, - 0, 0, 0, 156, 3, 0, 0, 6, - 0, 0, 0, 56, 0, 0, 0, 200, - 0, 0, 0, 176, 1, 0, 0, 44, - 2, 0, 0, 236, 2, 0, 0, 32, - 3, 0, 0, 65, 111, 110, 57, 136, - 0, 0, 0, 136, 0, 0, 0, 0, - 2, 255, 255, 96, 0, 0, 0, 40, - 0, 0, 0, 0, 0, 40, 0, 0, - 0, 40, 0, 0, 0, 40, 0, 1, - 0, 36, 0, 0, 0, 40, 0, 0, - 0, 0, 0, 1, 2, 255, 255, 31, - 0, 0, 2, 0, 0, 0, 128, 0, - 0, 3, 176, 31, 0, 0, 2, 0, - 0, 0, 144, 0, 8, 15, 160, 66, - 0, 0, 3, 0, 0, 15, 128, 0, - 0, 228, 176, 0, 8, 228, 160, 1, - 0, 0, 2, 0, 8, 15, 128, 0, - 0, 228, 128, 1, 0, 0, 2, 1, - 8, 15, 128, 0, 0, 228, 128, 1, - 0, 0, 2, 2, 8, 15, 128, 0, - 0, 228, 128, 1, 0, 0, 2, 3, - 8, 15, 128, 0, 0, 228, 128, 255, -255, 0, 0, 83, 72, 68, 82, 224, - 0, 0, 0, 64, 0, 0, 0, 56, - 0, 0, 0, 90, 0, 0, 3, 0, - 96, 16, 0, 0, 0, 0, 0, 88, - 24, 0, 4, 0, 112, 16, 0, 0, - 0, 0, 0, 85, 85, 0, 0, 98, - 16, 0, 3, 50, 16, 16, 0, 0, - 0, 0, 0, 101, 0, 0, 3, 242, - 32, 16, 0, 0, 0, 0, 0, 101, - 0, 0, 3, 242, 32, 16, 0, 1, - 0, 0, 0, 101, 0, 0, 3, 242, - 32, 16, 0, 2, 0, 0, 0, 101, - 0, 0, 3, 242, 32, 16, 0, 3, - 0, 0, 0, 104, 0, 0, 2, 1, - 0, 0, 0, 69, 0, 0, 9, 242, - 0, 16, 0, 0, 0, 0, 0, 70, - 16, 16, 0, 0, 0, 0, 0, 70, -126, 16, 0, 0, 0, 0, 0, 0, - 96, 16, 0, 0, 0, 0, 0, 54, - 0, 0, 5, 242, 32, 16, 0, 0, - 0, 0, 0, 70, 14, 16, 0, 0, - 0, 0, 0, 54, 0, 0, 5, 242, - 32, 16, 0, 1, 0, 0, 0, 70, - 14, 16, 0, 0, 0, 0, 0, 54, - 0, 0, 5, 242, 32, 16, 0, 2, - 0, 0, 0, 70, 14, 16, 0, 0, - 0, 0, 0, 54, 0, 0, 5, 242, - 32, 16, 0, 3, 0, 0, 0, 70, - 14, 16, 0, 0, 0, 0, 0, 62, - 0, 0, 1, 83, 84, 65, 84, 116, - 0, 0, 0, 6, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 5, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 4, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 82, - 68, 69, 70, 184, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, - 0, 0, 0, 28, 0, 0, 0, 0, - 4, 255, 255, 0, 65, 0, 0, 134, - 0, 0, 0, 92, 0, 0, 0, 3, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 1, - 0, 0, 0, 113, 0, 0, 0, 2, - 0, 0, 0, 5, 0, 0, 0, 4, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 1, 0, 0, 0, 13, - 0, 0, 0, 115, 97, 109, 112, 108, -101, 114, 95, 95, 67, 67, 95, 84, -101, 120, 116, 117, 114, 101, 48, 0, -116, 101, 120, 116, 117, 114, 101, 95, - 95, 67, 67, 95, 84, 101, 120, 116, -117, 114, 101, 48, 0, 77, 105, 99, -114, 111, 115, 111, 102, 116, 32, 40, - 82, 41, 32, 72, 76, 83, 76, 32, - 83, 104, 97, 100, 101, 114, 32, 67, -111, 109, 112, 105, 108, 101, 114, 32, - 54, 46, 51, 46, 57, 54, 48, 48, - 46, 49, 54, 51, 56, 52, 0, 73, - 83, 71, 78, 44, 0, 0, 0, 1, - 0, 0, 0, 8, 0, 0, 0, 32, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 3, 0, 0, 0, 0, - 0, 0, 0, 3, 3, 0, 0, 84, - 69, 88, 67, 79, 79, 82, 68, 0, -171, 171, 171, 79, 83, 71, 78, 116, - 0, 0, 0, 4, 0, 0, 0, 8, - 0, 0, 0, 104, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 0, 0, 0, 0, 0, 0, 15, - 0, 0, 0, 104, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 0, 0, 1, 0, 0, 0, 15, - 0, 0, 0, 104, 0, 0, 0, 2, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 0, 0, 2, 0, 0, 0, 15, - 0, 0, 0, 104, 0, 0, 0, 3, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 0, 0, 3, 0, 0, 0, 15, - 0, 0, 0, 83, 86, 95, 84, 97, -114, 103, 101, 116, 0, 171, 171, 68, - 88, 66, 67, 110, 14, 140, 120, 239, -110, 56, 78, 103, 37, 245, 162, 140, -151, 93, 223, 1, 0, 0, 0, 144, - 4, 0, 0, 6, 0, 0, 0, 56, - 0, 0, 0, 68, 1, 0, 0, 156, - 2, 0, 0, 24, 3, 0, 0, 236, - 3, 0, 0, 56, 4, 0, 0, 65, -111, 110, 57, 4, 1, 0, 0, 4, - 1, 0, 0, 0, 2, 254, 255, 208, - 0, 0, 0, 52, 0, 0, 0, 1, - 0, 36, 0, 0, 0, 48, 0, 0, - 0, 48, 0, 0, 0, 36, 0, 1, - 0, 48, 0, 0, 0, 0, 0, 4, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 2, 254, 255, 81, - 0, 0, 5, 5, 0, 15, 160, 0, - 0, 0, 63, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 31, - 0, 0, 2, 5, 0, 0, 128, 0, - 0, 15, 144, 31, 0, 0, 2, 5, - 0, 1, 128, 1, 0, 15, 144, 9, - 0, 0, 3, 0, 0, 1, 128, 3, - 0, 228, 160, 0, 0, 228, 144, 9, - 0, 0, 3, 0, 0, 2, 128, 4, - 0, 228, 160, 0, 0, 228, 144, 2, - 0, 0, 3, 0, 0, 1, 128, 0, - 0, 85, 128, 0, 0, 0, 128, 5, - 0, 0, 3, 0, 0, 4, 192, 0, - 0, 0, 128, 5, 0, 0, 160, 9, - 0, 0, 3, 0, 0, 1, 128, 2, - 0, 228, 160, 0, 0, 228, 144, 1, - 0, 0, 2, 1, 0, 2, 128, 0, - 0, 0, 129, 9, 0, 0, 3, 1, - 0, 1, 128, 1, 0, 228, 160, 0, - 0, 228, 144, 4, 0, 0, 4, 0, - 0, 3, 192, 0, 0, 85, 128, 0, - 0, 228, 160, 1, 0, 228, 128, 1, - 0, 0, 2, 0, 0, 8, 192, 0, - 0, 85, 128, 1, 0, 0, 2, 0, - 0, 3, 224, 1, 0, 228, 144, 255, -255, 0, 0, 83, 72, 68, 82, 80, - 1, 0, 0, 64, 0, 1, 0, 84, - 0, 0, 0, 89, 0, 0, 4, 70, -142, 32, 0, 0, 0, 0, 0, 4, - 0, 0, 0, 95, 0, 0, 3, 242, - 16, 16, 0, 0, 0, 0, 0, 95, - 0, 0, 3, 50, 16, 16, 0, 1, - 0, 0, 0, 101, 0, 0, 3, 50, - 32, 16, 0, 0, 0, 0, 0, 103, - 0, 0, 4, 242, 32, 16, 0, 1, - 0, 0, 0, 1, 0, 0, 0, 104, - 0, 0, 2, 1, 0, 0, 0, 54, - 0, 0, 5, 50, 32, 16, 0, 0, - 0, 0, 0, 70, 16, 16, 0, 1, - 0, 0, 0, 17, 0, 0, 8, 18, - 0, 16, 0, 0, 0, 0, 0, 70, -142, 32, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 70, 30, 16, 0, 0, - 0, 0, 0, 54, 0, 0, 6, 34, - 32, 16, 0, 1, 0, 0, 0, 10, - 0, 16, 128, 65, 0, 0, 0, 0, - 0, 0, 0, 17, 0, 0, 8, 18, - 0, 16, 0, 0, 0, 0, 0, 70, -142, 32, 0, 0, 0, 0, 0, 2, - 0, 0, 0, 70, 30, 16, 0, 0, - 0, 0, 0, 17, 0, 0, 8, 34, - 0, 16, 0, 0, 0, 0, 0, 70, -142, 32, 0, 0, 0, 0, 0, 3, - 0, 0, 0, 70, 30, 16, 0, 0, - 0, 0, 0, 0, 0, 0, 7, 18, - 0, 16, 0, 0, 0, 0, 0, 26, - 0, 16, 0, 0, 0, 0, 0, 10, - 0, 16, 0, 0, 0, 0, 0, 54, - 0, 0, 5, 130, 32, 16, 0, 1, - 0, 0, 0, 26, 0, 16, 0, 0, - 0, 0, 0, 56, 0, 0, 7, 66, - 32, 16, 0, 1, 0, 0, 0, 10, - 0, 16, 0, 0, 0, 0, 0, 1, - 64, 0, 0, 0, 0, 0, 63, 17, - 0, 0, 8, 18, 32, 16, 0, 1, - 0, 0, 0, 70, 142, 32, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 70, - 30, 16, 0, 0, 0, 0, 0, 62, - 0, 0, 1, 83, 84, 65, 84, 116, - 0, 0, 0, 10, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 4, - 0, 0, 0, 7, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 82, - 68, 69, 70, 204, 0, 0, 0, 1, - 0, 0, 0, 72, 0, 0, 0, 1, - 0, 0, 0, 28, 0, 0, 0, 0, - 4, 254, 255, 0, 65, 0, 0, 152, - 0, 0, 0, 60, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 36, 71, 108, 111, 98, - 97, 108, 115, 0, 171, 171, 171, 60, - 0, 0, 0, 1, 0, 0, 0, 96, - 0, 0, 0, 64, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 120, - 0, 0, 0, 0, 0, 0, 0, 64, - 0, 0, 0, 2, 0, 0, 0, 136, - 0, 0, 0, 0, 0, 0, 0, 95, - 67, 67, 95, 77, 86, 80, 77, 97, -116, 114, 105, 120, 0, 171, 171, 3, - 0, 3, 0, 4, 0, 4, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 77, -105, 99, 114, 111, 115, 111, 102, 116, - 32, 40, 82, 41, 32, 72, 76, 83, - 76, 32, 83, 104, 97, 100, 101, 114, - 32, 67, 111, 109, 112, 105, 108, 101, -114, 32, 54, 46, 51, 46, 57, 54, - 48, 48, 46, 49, 54, 51, 56, 52, - 0, 171, 171, 73, 83, 71, 78, 68, - 0, 0, 0, 2, 0, 0, 0, 8, - 0, 0, 0, 56, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 0, 0, 0, 0, 0, 0, 15, - 15, 0, 0, 56, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 3, - 0, 0, 0, 1, 0, 0, 0, 3, - 3, 0, 0, 84, 69, 88, 67, 79, - 79, 82, 68, 0, 171, 171, 171, 79, - 83, 71, 78, 80, 0, 0, 0, 2, - 0, 0, 0, 8, 0, 0, 0, 56, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 3, 0, 0, 0, 0, - 0, 0, 0, 3, 12, 0, 0, 65, - 0, 0, 0, 0, 0, 0, 0, 1, - 0, 0, 0, 3, 0, 0, 0, 1, - 0, 0, 0, 15, 0, 0, 0, 84, - 69, 88, 67, 79, 79, 82, 68, 0, - 83, 86, 95, 80, 111, 115, 105, 116, -105, 111, 110, 0, 171, 171, 171, -}; - -const unsigned char s_5AB8DB57D1AF885A330F6D412926E002C77583E6[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 1, 0, - 0, 0, 82, 139, 0, 0, 7, 0, - 0, 0, 97, 95, 99, 111, 108, 111, -114, 0, 0, 0, 0, 80, 139, 0, - 0, 10, 0, 0, 0, 97, 95, 116, -101, 120, 67, 111, 111, 114, 100, 2, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 4, 0, 0, 0, 92, 139, 0, 0, -242, 141, 0, 0, 12, 0, 0, 0, - 67, 67, 95, 77, 86, 80, 77, 97, -116, 114, 105, 120, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 4, 0, 0, 0, 94, 139, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, - 67, 67, 95, 84, 101, 120, 116, 117, -114, 101, 48, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 82, 139, 0, 0, 240, -141, 0, 0, 13, 0, 0, 0, 118, - 95, 101, 102, 102, 101, 99, 116, 67, -111, 108, 111, 114, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 82, 139, 0, 0, -240, 141, 0, 0, 11, 0, 0, 0, -118, 95, 116, 101, 120, 116, 67, 111, -108, 111, 114, 0, 0, 0, 0, 1, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 4, 0, 0, 0, 12, - 0, 0, 0, 67, 67, 95, 77, 86, - 80, 77, 97, 116, 114, 105, 120, 0, - 0, 0, 0, 0, 0, 0, 0, 11, - 0, 0, 0, 67, 67, 95, 84, 101, -120, 116, 117, 114, 101, 48, 0, 0, - 0, 0, 1, 0, 0, 0, 13, 0, - 0, 0, 118, 95, 101, 102, 102, 101, - 99, 116, 67, 111, 108, 111, 114, 0, - 0, 0, 0, 2, 0, 0, 0, 11, - 0, 0, 0, 118, 95, 116, 101, 120, -116, 67, 111, 108, 111, 114, 0, 0, - 0, 0, 3, 0, 0, 0, 208, 7, - 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 136, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 88, 66, 67, 200, 231, - 18, 41, 110, 41, 221, 200, 15, 188, - 87, 29, 162, 99, 245, 36, 1, 0, - 0, 0, 208, 7, 0, 0, 6, 0, - 0, 0, 56, 0, 0, 0, 56, 2, - 0, 0, 44, 5, 0, 0, 168, 5, - 0, 0, 8, 7, 0, 0, 84, 7, - 0, 0, 65, 111, 110, 57, 248, 1, - 0, 0, 248, 1, 0, 0, 0, 2, -255, 255, 196, 1, 0, 0, 52, 0, - 0, 0, 1, 0, 40, 0, 0, 0, - 52, 0, 0, 0, 52, 0, 1, 0, - 36, 0, 0, 0, 52, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 1, 2, -255, 255, 81, 0, 0, 5, 2, 0, - 15, 160, 31, 133, 235, 190, 254, 255, - 71, 65, 0, 0, 0, 192, 0, 0, - 64, 64, 81, 0, 0, 5, 3, 0, - 15, 160, 0, 0, 0, 191, 0, 0, -128, 63, 0, 0, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 2, 0, 0, - 0, 128, 0, 0, 15, 176, 31, 0, - 0, 2, 0, 0, 0, 128, 1, 0, - 3, 176, 31, 0, 0, 2, 0, 0, - 0, 144, 0, 8, 15, 160, 66, 0, - 0, 3, 0, 0, 15, 128, 1, 0, -228, 176, 0, 8, 228, 160, 7, 0, - 0, 2, 0, 0, 1, 128, 0, 0, -255, 128, 2, 0, 0, 3, 0, 0, - 2, 128, 0, 0, 255, 128, 2, 0, - 0, 160, 5, 0, 0, 3, 0, 0, - 18, 128, 0, 0, 85, 128, 2, 0, - 85, 160, 6, 0, 0, 2, 0, 0, - 1, 128, 0, 0, 0, 128, 2, 0, - 0, 3, 0, 0, 1, 128, 0, 0, - 0, 128, 3, 0, 0, 160, 2, 0, - 0, 3, 0, 0, 17, 128, 0, 0, - 0, 128, 0, 0, 0, 128, 4, 0, - 0, 4, 0, 0, 4, 128, 0, 0, - 0, 128, 2, 0, 170, 160, 2, 0, -255, 160, 5, 0, 0, 3, 0, 0, - 1, 128, 0, 0, 0, 128, 0, 0, - 0, 128, 5, 0, 0, 3, 0, 0, - 1, 128, 0, 0, 0, 128, 0, 0, -170, 128, 4, 0, 0, 4, 0, 0, - 4, 128, 0, 0, 85, 128, 2, 0, -170, 160, 2, 0, 255, 160, 5, 0, - 0, 3, 0, 0, 2, 128, 0, 0, - 85, 128, 0, 0, 85, 128, 5, 0, - 0, 3, 0, 0, 8, 128, 0, 0, - 85, 128, 0, 0, 170, 128, 4, 0, - 0, 4, 0, 0, 2, 128, 0, 0, -170, 128, 0, 0, 85, 129, 3, 0, - 85, 160, 11, 0, 0, 3, 1, 0, - 8, 128, 0, 0, 255, 128, 0, 0, - 0, 128, 5, 0, 0, 3, 2, 0, - 15, 128, 0, 0, 255, 128, 1, 0, -228, 160, 4, 0, 0, 4, 0, 0, - 15, 128, 0, 0, 228, 160, 0, 0, - 85, 128, 2, 0, 228, 128, 5, 0, - 0, 3, 0, 0, 8, 128, 0, 0, -255, 128, 1, 0, 255, 128, 5, 0, - 0, 3, 0, 0, 15, 128, 0, 0, -228, 128, 0, 0, 228, 176, 1, 0, - 0, 2, 0, 8, 15, 128, 0, 0, -228, 128, 1, 0, 0, 2, 1, 8, - 15, 128, 0, 0, 228, 128, 1, 0, - 0, 2, 2, 8, 15, 128, 0, 0, -228, 128, 1, 0, 0, 2, 3, 8, - 15, 128, 0, 0, 228, 128, 255, 255, - 0, 0, 83, 72, 68, 82, 236, 2, - 0, 0, 64, 0, 0, 0, 187, 0, - 0, 0, 89, 0, 0, 4, 70, 142, - 32, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 90, 0, 0, 3, 0, 96, - 16, 0, 0, 0, 0, 0, 88, 24, - 0, 4, 0, 112, 16, 0, 0, 0, - 0, 0, 85, 85, 0, 0, 98, 16, - 0, 3, 242, 16, 16, 0, 0, 0, - 0, 0, 98, 16, 0, 3, 50, 16, - 16, 0, 1, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 0, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 1, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 2, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 3, 0, 0, 0, 104, 0, - 0, 2, 2, 0, 0, 0, 69, 0, - 0, 9, 242, 0, 16, 0, 0, 0, - 0, 0, 70, 16, 16, 0, 1, 0, - 0, 0, 70, 126, 16, 0, 0, 0, - 0, 0, 0, 96, 16, 0, 0, 0, - 0, 0, 75, 0, 0, 5, 18, 0, - 16, 0, 0, 0, 0, 0, 58, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 0, 10, 50, 0, 16, 0, 0, 0, - 0, 0, 198, 0, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, 0, 0, - 0, 191, 31, 133, 235, 190, 0, 0, - 0, 0, 0, 0, 0, 0, 56, 32, - 0, 7, 34, 0, 16, 0, 0, 0, - 0, 0, 26, 0, 16, 0, 0, 0, - 0, 0, 1, 64, 0, 0, 254, 255, - 71, 65, 0, 32, 0, 7, 18, 0, - 16, 0, 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 50, 0, - 0, 9, 66, 0, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, 0, 0, - 0, 0, 1, 64, 0, 0, 0, 0, - 0, 192, 1, 64, 0, 0, 0, 0, - 64, 64, 56, 0, 0, 7, 18, 0, - 16, 0, 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 56, 0, - 0, 7, 18, 0, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, 0, 0, - 0, 0, 42, 0, 16, 0, 0, 0, - 0, 0, 50, 0, 0, 9, 66, 0, - 16, 0, 0, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, 1, 64, - 0, 0, 0, 0, 0, 192, 1, 64, - 0, 0, 0, 0, 64, 64, 56, 0, - 0, 7, 34, 0, 16, 0, 0, 0, - 0, 0, 26, 0, 16, 0, 0, 0, - 0, 0, 26, 0, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 7, 130, 0, - 16, 0, 0, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, 42, 0, - 16, 0, 0, 0, 0, 0, 50, 0, - 0, 10, 34, 0, 16, 0, 0, 0, - 0, 0, 42, 0, 16, 128, 65, 0, - 0, 0, 0, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, 1, 64, - 0, 0, 0, 0, 128, 63, 52, 0, - 0, 7, 18, 0, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, 0, 0, - 0, 0, 58, 0, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 8, 242, 0, - 16, 0, 1, 0, 0, 0, 246, 15, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 50, 0, 0, 10, 242, 0, - 16, 0, 1, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 86, 5, 16, 0, 0, 0, - 0, 0, 70, 14, 16, 0, 1, 0, - 0, 0, 56, 0, 0, 7, 130, 0, - 16, 0, 1, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 58, 0, - 16, 0, 1, 0, 0, 0, 56, 0, - 0, 7, 242, 0, 16, 0, 0, 0, - 0, 0, 70, 14, 16, 0, 1, 0, - 0, 0, 70, 30, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 0, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 1, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 2, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 3, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 62, 0, 0, 1, 83, 84, - 65, 84, 116, 0, 0, 0, 22, 0, - 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 6, 0, 0, 0, 16, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 68, 69, 70, 88, 1, - 0, 0, 1, 0, 0, 0, 176, 0, - 0, 0, 3, 0, 0, 0, 28, 0, - 0, 0, 0, 4, 255, 255, 0, 65, - 0, 0, 37, 1, 0, 0, 124, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 1, 0, 0, 0, 145, 0, - 0, 0, 2, 0, 0, 0, 5, 0, - 0, 0, 4, 0, 0, 0, 255, 255, -255, 255, 0, 0, 0, 0, 1, 0, - 0, 0, 13, 0, 0, 0, 166, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 115, 97, -109, 112, 108, 101, 114, 95, 95, 67, - 67, 95, 84, 101, 120, 116, 117, 114, -101, 48, 0, 116, 101, 120, 116, 117, -114, 101, 95, 95, 67, 67, 95, 84, -101, 120, 116, 117, 114, 101, 48, 0, - 36, 71, 108, 111, 98, 97, 108, 115, - 0, 171, 166, 0, 0, 0, 2, 0, - 0, 0, 200, 0, 0, 0, 32, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 248, 0, 0, 0, 0, 0, - 0, 0, 16, 0, 0, 0, 2, 0, - 0, 0, 8, 1, 0, 0, 0, 0, - 0, 0, 24, 1, 0, 0, 16, 0, - 0, 0, 16, 0, 0, 0, 2, 0, - 0, 0, 8, 1, 0, 0, 0, 0, - 0, 0, 95, 118, 95, 101, 102, 102, -101, 99, 116, 67, 111, 108, 111, 114, - 0, 171, 1, 0, 3, 0, 1, 0, - 4, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 95, 118, 95, 116, 101, 120, -116, 67, 111, 108, 111, 114, 0, 77, -105, 99, 114, 111, 115, 111, 102, 116, - 32, 40, 82, 41, 32, 72, 76, 83, - 76, 32, 83, 104, 97, 100, 101, 114, - 32, 67, 111, 109, 112, 105, 108, 101, -114, 32, 54, 46, 51, 46, 57, 54, - 48, 48, 46, 49, 54, 51, 56, 52, - 0, 171, 73, 83, 71, 78, 68, 0, - 0, 0, 2, 0, 0, 0, 8, 0, - 0, 0, 56, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 15, 15, - 0, 0, 56, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, 3, 3, - 0, 0, 84, 69, 88, 67, 79, 79, - 82, 68, 0, 171, 171, 171, 79, 83, - 71, 78, 116, 0, 0, 0, 4, 0, - 0, 0, 8, 0, 0, 0, 104, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 1, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 2, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 3, 0, - 0, 0, 15, 0, 0, 0, 83, 86, - 95, 84, 97, 114, 103, 101, 116, 0, -171, 171, 68, 88, 66, 67, 235, 56, -180, 223, 125, 231, 231, 218, 70, 75, - 12, 63, 200, 233, 69, 121, 1, 0, - 0, 0, 4, 5, 0, 0, 6, 0, - 0, 0, 56, 0, 0, 0, 92, 1, - 0, 0, 224, 2, 0, 0, 92, 3, - 0, 0, 48, 4, 0, 0, 148, 4, - 0, 0, 65, 111, 110, 57, 28, 1, - 0, 0, 28, 1, 0, 0, 0, 2, -254, 255, 232, 0, 0, 0, 52, 0, - 0, 0, 1, 0, 36, 0, 0, 0, - 48, 0, 0, 0, 48, 0, 0, 0, - 36, 0, 1, 0, 48, 0, 0, 0, - 0, 0, 4, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 2, -254, 255, 81, 0, 0, 5, 5, 0, - 15, 160, 0, 0, 0, 63, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 2, 5, 0, - 0, 128, 0, 0, 15, 144, 31, 0, - 0, 2, 5, 0, 1, 128, 1, 0, - 15, 144, 31, 0, 0, 2, 5, 0, - 2, 128, 2, 0, 15, 144, 9, 0, - 0, 3, 0, 0, 1, 128, 3, 0, -228, 160, 1, 0, 228, 144, 9, 0, - 0, 3, 0, 0, 2, 128, 4, 0, -228, 160, 1, 0, 228, 144, 2, 0, - 0, 3, 0, 0, 1, 128, 0, 0, - 85, 128, 0, 0, 0, 128, 5, 0, - 0, 3, 0, 0, 4, 192, 0, 0, - 0, 128, 5, 0, 0, 160, 9, 0, - 0, 3, 0, 0, 1, 128, 2, 0, -228, 160, 1, 0, 228, 144, 1, 0, - 0, 2, 1, 0, 2, 128, 0, 0, - 0, 129, 9, 0, 0, 3, 1, 0, - 1, 128, 1, 0, 228, 160, 1, 0, -228, 144, 4, 0, 0, 4, 0, 0, - 3, 192, 0, 0, 85, 128, 0, 0, -228, 160, 1, 0, 228, 128, 1, 0, - 0, 2, 0, 0, 8, 192, 0, 0, - 85, 128, 1, 0, 0, 2, 0, 0, - 15, 224, 0, 0, 228, 144, 1, 0, - 0, 2, 1, 0, 3, 224, 2, 0, -228, 144, 255, 255, 0, 0, 83, 72, - 68, 82, 124, 1, 0, 0, 64, 0, - 1, 0, 95, 0, 0, 0, 89, 0, - 0, 4, 70, 142, 32, 0, 0, 0, - 0, 0, 4, 0, 0, 0, 95, 0, - 0, 3, 242, 16, 16, 0, 0, 0, - 0, 0, 95, 0, 0, 3, 242, 16, - 16, 0, 1, 0, 0, 0, 95, 0, - 0, 3, 50, 16, 16, 0, 2, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 0, 0, 0, 0, 101, 0, - 0, 3, 50, 32, 16, 0, 1, 0, - 0, 0, 103, 0, 0, 4, 242, 32, - 16, 0, 2, 0, 0, 0, 1, 0, - 0, 0, 104, 0, 0, 2, 1, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 0, 0, 0, 0, 70, 30, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 50, 32, 16, 0, 1, 0, - 0, 0, 70, 16, 16, 0, 2, 0, - 0, 0, 17, 0, 0, 8, 18, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 54, 0, 0, 6, 34, 32, - 16, 0, 2, 0, 0, 0, 10, 0, - 16, 128, 65, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 8, 18, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 17, 0, 0, 8, 34, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 0, 0, 0, 7, 18, 0, - 16, 0, 0, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 130, 32, 16, 0, 2, 0, - 0, 0, 26, 0, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 7, 66, 32, - 16, 0, 2, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 1, 64, - 0, 0, 0, 0, 0, 63, 17, 0, - 0, 8, 18, 32, 16, 0, 2, 0, - 0, 0, 70, 142, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 70, 30, - 16, 0, 1, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, 116, 0, - 0, 0, 11, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 6, 0, - 0, 0, 7, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 82, 68, - 69, 70, 204, 0, 0, 0, 1, 0, - 0, 0, 72, 0, 0, 0, 1, 0, - 0, 0, 28, 0, 0, 0, 0, 4, -254, 255, 0, 65, 0, 0, 152, 0, - 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 36, 71, 108, 111, 98, 97, -108, 115, 0, 171, 171, 171, 60, 0, - 0, 0, 1, 0, 0, 0, 96, 0, - 0, 0, 64, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 120, 0, - 0, 0, 0, 0, 0, 0, 64, 0, - 0, 0, 2, 0, 0, 0, 136, 0, - 0, 0, 0, 0, 0, 0, 95, 67, - 67, 95, 77, 86, 80, 77, 97, 116, -114, 105, 120, 0, 171, 171, 3, 0, - 3, 0, 4, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 77, 105, - 99, 114, 111, 115, 111, 102, 116, 32, - 40, 82, 41, 32, 72, 76, 83, 76, - 32, 83, 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, 101, 114, - 32, 54, 46, 51, 46, 57, 54, 48, - 48, 46, 49, 54, 51, 56, 52, 0, -171, 171, 73, 83, 71, 78, 92, 0, - 0, 0, 3, 0, 0, 0, 8, 0, - 0, 0, 80, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 15, 15, - 0, 0, 80, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, 15, 15, - 0, 0, 80, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, 3, 3, - 0, 0, 84, 69, 88, 67, 79, 79, - 82, 68, 0, 171, 171, 171, 79, 83, - 71, 78, 104, 0, 0, 0, 3, 0, - 0, 0, 8, 0, 0, 0, 80, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, 80, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 1, 0, - 0, 0, 3, 12, 0, 0, 89, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 3, 0, 0, 0, 2, 0, - 0, 0, 15, 0, 0, 0, 84, 69, - 88, 67, 79, 79, 82, 68, 0, 83, - 86, 95, 80, 111, 115, 105, 116, 105, -111, 110, 0, 171, 171, 171, -}; - -const unsigned char s_600D338F001630222A3BBB2BBD77CE56F9E52D9E[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 1, 0, - 0, 0, 82, 139, 0, 0, 7, 0, - 0, 0, 97, 95, 99, 111, 108, 111, -114, 0, 0, 0, 0, 80, 139, 0, - 0, 10, 0, 0, 0, 97, 95, 116, -101, 120, 67, 111, 111, 114, 100, 2, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 3, 0, 0, 0, 92, 139, 0, 0, -242, 141, 0, 0, 12, 0, 0, 0, - 67, 67, 95, 77, 86, 80, 77, 97, -116, 114, 105, 120, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 4, 0, 0, 0, 94, 139, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, - 67, 67, 95, 84, 101, 120, 116, 117, -114, 101, 48, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 82, 139, 0, 0, 240, -141, 0, 0, 11, 0, 0, 0, 118, - 95, 116, 101, 120, 116, 67, 111, 108, -111, 114, 0, 0, 0, 0, 0, 0, - 0, 0, 255, 255, 255, 255, 1, 0, - 0, 0, 3, 0, 0, 0, 12, 0, - 0, 0, 67, 67, 95, 77, 86, 80, - 77, 97, 116, 114, 105, 120, 0, 0, - 0, 0, 0, 0, 0, 0, 11, 0, - 0, 0, 67, 67, 95, 84, 101, 120, -116, 117, 114, 101, 48, 0, 0, 0, - 0, 1, 0, 0, 0, 11, 0, 0, - 0, 118, 95, 116, 101, 120, 116, 67, -111, 108, 111, 114, 0, 0, 0, 0, - 2, 0, 0, 0, 240, 5, 0, 0, - 4, 5, 0, 0, 0, 0, 0, 0, -212, 136, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 68, 88, 66, 67, 51, 30, 35, 79, -208, 193, 179, 190, 183, 160, 177, 72, - 13, 48, 185, 142, 1, 0, 0, 0, -240, 5, 0, 0, 6, 0, 0, 0, - 56, 0, 0, 0, 124, 1, 0, 0, -112, 3, 0, 0, 236, 3, 0, 0, - 40, 5, 0, 0, 116, 5, 0, 0, - 65, 111, 110, 57, 60, 1, 0, 0, - 60, 1, 0, 0, 0, 2, 255, 255, - 8, 1, 0, 0, 52, 0, 0, 0, - 1, 0, 40, 0, 0, 0, 52, 0, - 0, 0, 52, 0, 1, 0, 36, 0, - 0, 0, 52, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 1, 2, 255, 255, - 81, 0, 0, 5, 1, 0, 15, 160, - 31, 133, 235, 190, 254, 255, 71, 65, - 0, 0, 0, 192, 0, 0, 64, 64, - 31, 0, 0, 2, 0, 0, 0, 128, - 0, 0, 15, 176, 31, 0, 0, 2, - 0, 0, 0, 128, 1, 0, 3, 176, - 31, 0, 0, 2, 0, 0, 0, 144, - 0, 8, 15, 160, 66, 0, 0, 3, - 0, 0, 15, 128, 1, 0, 228, 176, - 0, 8, 228, 160, 2, 0, 0, 3, - 0, 0, 1, 128, 0, 0, 255, 128, - 1, 0, 0, 160, 5, 0, 0, 3, - 0, 0, 17, 128, 0, 0, 0, 128, - 1, 0, 85, 160, 4, 0, 0, 4, - 0, 0, 2, 128, 0, 0, 0, 128, - 1, 0, 170, 160, 1, 0, 255, 160, - 5, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 0, 128, 0, 0, 0, 128, - 5, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 0, 128, 0, 0, 85, 128, - 5, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 0, 128, 0, 0, 255, 160, - 5, 0, 0, 3, 0, 0, 8, 128, - 0, 0, 0, 128, 0, 0, 255, 176, - 5, 0, 0, 3, 0, 0, 7, 128, - 0, 0, 228, 176, 0, 0, 228, 160, - 1, 0, 0, 2, 0, 8, 15, 128, - 0, 0, 228, 128, 1, 0, 0, 2, - 1, 8, 15, 128, 0, 0, 228, 128, - 1, 0, 0, 2, 2, 8, 15, 128, - 0, 0, 228, 128, 1, 0, 0, 2, - 3, 8, 15, 128, 0, 0, 228, 128, -255, 255, 0, 0, 83, 72, 68, 82, -236, 1, 0, 0, 64, 0, 0, 0, -123, 0, 0, 0, 89, 0, 0, 4, - 70, 142, 32, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 90, 0, 0, 3, - 0, 96, 16, 0, 0, 0, 0, 0, - 88, 24, 0, 4, 0, 112, 16, 0, - 0, 0, 0, 0, 85, 85, 0, 0, - 98, 16, 0, 3, 242, 16, 16, 0, - 0, 0, 0, 0, 98, 16, 0, 3, - 50, 16, 16, 0, 1, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 0, 0, 0, 0, 101, 0, 0, 3, -242, 32, 16, 0, 1, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 2, 0, 0, 0, 101, 0, 0, 3, -242, 32, 16, 0, 3, 0, 0, 0, -104, 0, 0, 2, 1, 0, 0, 0, - 69, 0, 0, 9, 242, 0, 16, 0, - 0, 0, 0, 0, 70, 16, 16, 0, - 1, 0, 0, 0, 70, 126, 16, 0, - 0, 0, 0, 0, 0, 96, 16, 0, - 0, 0, 0, 0, 0, 0, 0, 7, - 18, 0, 16, 0, 0, 0, 0, 0, - 58, 0, 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 31, 133, 235, 190, - 56, 32, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 1, 64, 0, 0, -254, 255, 71, 65, 50, 0, 0, 9, - 34, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 0, 0, 0, 192, - 1, 64, 0, 0, 0, 0, 64, 64, - 56, 0, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 56, 0, 0, 7, - 18, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, 0, 0, - 26, 0, 16, 0, 0, 0, 0, 0, - 56, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 58, 128, 32, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 56, 0, 0, 7, 130, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 58, 16, 16, 0, - 0, 0, 0, 0, 56, 0, 0, 8, -114, 0, 16, 0, 0, 0, 0, 0, - 70, 18, 16, 0, 0, 0, 0, 0, - 70, 130, 32, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -242, 32, 16, 0, 0, 0, 0, 0, - 70, 14, 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 1, 0, 0, 0, 70, 14, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -242, 32, 16, 0, 2, 0, 0, 0, - 70, 14, 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 3, 0, 0, 0, 70, 14, 16, 0, - 0, 0, 0, 0, 62, 0, 0, 1, - 83, 84, 65, 84, 116, 0, 0, 0, - 14, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 6, 0, 0, 0, - 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 82, 68, 69, 70, - 52, 1, 0, 0, 1, 0, 0, 0, -176, 0, 0, 0, 3, 0, 0, 0, - 28, 0, 0, 0, 0, 4, 255, 255, - 0, 65, 0, 0, 0, 1, 0, 0, -124, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 1, 0, 0, 0, -145, 0, 0, 0, 2, 0, 0, 0, - 5, 0, 0, 0, 4, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 1, 0, 0, 0, 13, 0, 0, 0, -166, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, -115, 97, 109, 112, 108, 101, 114, 95, - 95, 67, 67, 95, 84, 101, 120, 116, -117, 114, 101, 48, 0, 116, 101, 120, -116, 117, 114, 101, 95, 95, 67, 67, - 95, 84, 101, 120, 116, 117, 114, 101, - 48, 0, 36, 71, 108, 111, 98, 97, -108, 115, 0, 171, 166, 0, 0, 0, - 1, 0, 0, 0, 200, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 224, 0, 0, 0, - 0, 0, 0, 0, 16, 0, 0, 0, - 2, 0, 0, 0, 240, 0, 0, 0, - 0, 0, 0, 0, 95, 118, 95, 116, -101, 120, 116, 67, 111, 108, 111, 114, - 0, 171, 171, 171, 1, 0, 3, 0, - 1, 0, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 77, 105, 99, 114, -111, 115, 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, 32, 83, -104, 97, 100, 101, 114, 32, 67, 111, -109, 112, 105, 108, 101, 114, 32, 54, - 46, 51, 46, 57, 54, 48, 48, 46, - 49, 54, 51, 56, 52, 0, 171, 171, - 73, 83, 71, 78, 68, 0, 0, 0, - 2, 0, 0, 0, 8, 0, 0, 0, - 56, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 15, 0, 0, - 56, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 3, 3, 0, 0, - 84, 69, 88, 67, 79, 79, 82, 68, - 0, 171, 171, 171, 79, 83, 71, 78, -116, 0, 0, 0, 4, 0, 0, 0, - 8, 0, 0, 0, 104, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 104, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, 0, 0, - 15, 0, 0, 0, 104, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 2, 0, 0, 0, - 15, 0, 0, 0, 104, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 3, 0, 0, 0, - 15, 0, 0, 0, 83, 86, 95, 84, - 97, 114, 103, 101, 116, 0, 171, 171, - 68, 88, 66, 67, 235, 56, 180, 223, -125, 231, 231, 218, 70, 75, 12, 63, -200, 233, 69, 121, 1, 0, 0, 0, - 4, 5, 0, 0, 6, 0, 0, 0, - 56, 0, 0, 0, 92, 1, 0, 0, -224, 2, 0, 0, 92, 3, 0, 0, - 48, 4, 0, 0, 148, 4, 0, 0, - 65, 111, 110, 57, 28, 1, 0, 0, - 28, 1, 0, 0, 0, 2, 254, 255, -232, 0, 0, 0, 52, 0, 0, 0, - 1, 0, 36, 0, 0, 0, 48, 0, - 0, 0, 48, 0, 0, 0, 36, 0, - 1, 0, 48, 0, 0, 0, 0, 0, - 4, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 2, 254, 255, - 81, 0, 0, 5, 5, 0, 15, 160, - 0, 0, 0, 63, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 2, 5, 0, 0, 128, - 0, 0, 15, 144, 31, 0, 0, 2, - 5, 0, 1, 128, 1, 0, 15, 144, - 31, 0, 0, 2, 5, 0, 2, 128, - 2, 0, 15, 144, 9, 0, 0, 3, - 0, 0, 1, 128, 3, 0, 228, 160, - 1, 0, 228, 144, 9, 0, 0, 3, - 0, 0, 2, 128, 4, 0, 228, 160, - 1, 0, 228, 144, 2, 0, 0, 3, - 0, 0, 1, 128, 0, 0, 85, 128, - 0, 0, 0, 128, 5, 0, 0, 3, - 0, 0, 4, 192, 0, 0, 0, 128, - 5, 0, 0, 160, 9, 0, 0, 3, - 0, 0, 1, 128, 2, 0, 228, 160, - 1, 0, 228, 144, 1, 0, 0, 2, - 1, 0, 2, 128, 0, 0, 0, 129, - 9, 0, 0, 3, 1, 0, 1, 128, - 1, 0, 228, 160, 1, 0, 228, 144, - 4, 0, 0, 4, 0, 0, 3, 192, - 0, 0, 85, 128, 0, 0, 228, 160, - 1, 0, 228, 128, 1, 0, 0, 2, - 0, 0, 8, 192, 0, 0, 85, 128, - 1, 0, 0, 2, 0, 0, 15, 224, - 0, 0, 228, 144, 1, 0, 0, 2, - 1, 0, 3, 224, 2, 0, 228, 144, -255, 255, 0, 0, 83, 72, 68, 82, -124, 1, 0, 0, 64, 0, 1, 0, - 95, 0, 0, 0, 89, 0, 0, 4, - 70, 142, 32, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 95, 0, 0, 3, -242, 16, 16, 0, 0, 0, 0, 0, - 95, 0, 0, 3, 242, 16, 16, 0, - 1, 0, 0, 0, 95, 0, 0, 3, - 50, 16, 16, 0, 2, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 0, 0, 0, 0, 101, 0, 0, 3, - 50, 32, 16, 0, 1, 0, 0, 0, -103, 0, 0, 4, 242, 32, 16, 0, - 2, 0, 0, 0, 1, 0, 0, 0, -104, 0, 0, 2, 1, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 0, 0, 0, 0, 70, 30, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, - 50, 32, 16, 0, 1, 0, 0, 0, - 70, 16, 16, 0, 2, 0, 0, 0, - 17, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 54, 0, 0, 6, 34, 32, 16, 0, - 2, 0, 0, 0, 10, 0, 16, 128, - 65, 0, 0, 0, 0, 0, 0, 0, - 17, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 2, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 17, 0, 0, 8, 34, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 0, 0, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 26, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -130, 32, 16, 0, 2, 0, 0, 0, - 26, 0, 16, 0, 0, 0, 0, 0, - 56, 0, 0, 7, 66, 32, 16, 0, - 2, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 1, 64, 0, 0, - 0, 0, 0, 63, 17, 0, 0, 8, - 18, 32, 16, 0, 2, 0, 0, 0, - 70, 142, 32, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 30, 16, 0, - 1, 0, 0, 0, 62, 0, 0, 1, - 83, 84, 65, 84, 116, 0, 0, 0, - 11, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 6, 0, 0, 0, - 7, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 82, 68, 69, 70, -204, 0, 0, 0, 1, 0, 0, 0, - 72, 0, 0, 0, 1, 0, 0, 0, - 28, 0, 0, 0, 0, 4, 254, 255, - 0, 65, 0, 0, 152, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 36, 71, 108, 111, 98, 97, 108, 115, - 0, 171, 171, 171, 60, 0, 0, 0, - 1, 0, 0, 0, 96, 0, 0, 0, - 64, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 120, 0, 0, 0, - 0, 0, 0, 0, 64, 0, 0, 0, - 2, 0, 0, 0, 136, 0, 0, 0, - 0, 0, 0, 0, 95, 67, 67, 95, - 77, 86, 80, 77, 97, 116, 114, 105, -120, 0, 171, 171, 3, 0, 3, 0, - 4, 0, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 77, 105, 99, 114, -111, 115, 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, 32, 83, -104, 97, 100, 101, 114, 32, 67, 111, -109, 112, 105, 108, 101, 114, 32, 54, - 46, 51, 46, 57, 54, 48, 48, 46, - 49, 54, 51, 56, 52, 0, 171, 171, - 73, 83, 71, 78, 92, 0, 0, 0, - 3, 0, 0, 0, 8, 0, 0, 0, - 80, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 15, 0, 0, - 80, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 15, 15, 0, 0, - 80, 0, 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 2, 0, 0, 0, 3, 3, 0, 0, - 84, 69, 88, 67, 79, 79, 82, 68, - 0, 171, 171, 171, 79, 83, 71, 78, -104, 0, 0, 0, 3, 0, 0, 0, - 8, 0, 0, 0, 80, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 80, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, 0, 0, - 3, 12, 0, 0, 89, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 3, 0, 0, 0, 2, 0, 0, 0, - 15, 0, 0, 0, 84, 69, 88, 67, - 79, 79, 82, 68, 0, 83, 86, 95, - 80, 111, 115, 105, 116, 105, 111, 110, - 0, 171, 171, 171, -}; - -const unsigned char s_67837675F2BB48C0E926316F505FC1538228E0FA[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 1, 0, - 0, 0, 82, 139, 0, 0, 7, 0, - 0, 0, 97, 95, 99, 111, 108, 111, -114, 0, 0, 0, 0, 80, 139, 0, - 0, 10, 0, 0, 0, 97, 95, 116, -101, 120, 99, 111, 111, 114, 100, 2, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 92, 139, 0, 0, -242, 141, 0, 0, 12, 0, 0, 0, - 67, 67, 95, 77, 86, 80, 77, 97, -116, 114, 105, 120, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 4, 0, 0, 0, 1, 0, 0, 0, - 12, 0, 0, 0, 67, 67, 95, 77, - 86, 80, 77, 97, 116, 114, 105, 120, - 0, 0, 0, 0, 0, 0, 0, 0, - 16, 4, 0, 0, 48, 5, 0, 0, - 0, 0, 0, 0, 212, 136, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 68, 88, 66, 67, - 79, 226, 72, 124, 94, 252, 37, 157, -186, 66, 253, 29, 176, 252, 8, 124, - 1, 0, 0, 0, 16, 4, 0, 0, - 6, 0, 0, 0, 56, 0, 0, 0, - 28, 1, 0, 0, 116, 2, 0, 0, -240, 2, 0, 0, 72, 3, 0, 0, -148, 3, 0, 0, 65, 111, 110, 57, -220, 0, 0, 0, 220, 0, 0, 0, - 0, 2, 255, 255, 184, 0, 0, 0, - 36, 0, 0, 0, 0, 0, 36, 0, - 0, 0, 36, 0, 0, 0, 36, 0, - 0, 0, 36, 0, 0, 0, 36, 0, - 1, 2, 255, 255, 81, 0, 0, 5, - 0, 0, 15, 160, 0, 0, 0, 0, - 0, 0, 128, 63, 0, 0, 0, 0, - 0, 0, 0, 0, 31, 0, 0, 2, - 0, 0, 0, 128, 0, 0, 15, 176, - 31, 0, 0, 2, 0, 0, 0, 128, - 1, 0, 3, 176, 90, 0, 0, 4, - 0, 0, 8, 128, 1, 0, 228, 176, - 1, 0, 228, 176, 0, 0, 0, 160, - 7, 0, 0, 2, 0, 0, 1, 128, - 0, 0, 255, 128, 6, 0, 0, 2, - 0, 0, 1, 128, 0, 0, 0, 128, - 2, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 0, 129, 0, 0, 85, 160, - 88, 0, 0, 4, 0, 0, 15, 128, - 0, 0, 0, 128, 0, 0, 228, 176, - 0, 0, 0, 160, 1, 0, 0, 2, - 0, 8, 15, 128, 0, 0, 228, 128, - 1, 0, 0, 2, 1, 8, 15, 128, - 0, 0, 228, 128, 1, 0, 0, 2, - 2, 8, 15, 128, 0, 0, 228, 128, - 1, 0, 0, 2, 3, 8, 15, 128, - 0, 0, 228, 128, 255, 255, 0, 0, - 83, 72, 68, 82, 80, 1, 0, 0, - 64, 0, 0, 0, 84, 0, 0, 0, - 98, 16, 0, 3, 242, 16, 16, 0, - 0, 0, 0, 0, 98, 16, 0, 3, - 50, 16, 16, 0, 1, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 0, 0, 0, 0, 101, 0, 0, 3, -242, 32, 16, 0, 1, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 2, 0, 0, 0, 101, 0, 0, 3, -242, 32, 16, 0, 3, 0, 0, 0, -104, 0, 0, 2, 1, 0, 0, 0, - 15, 0, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 70, 16, 16, 0, - 1, 0, 0, 0, 70, 16, 16, 0, - 1, 0, 0, 0, 75, 0, 0, 5, - 18, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 128, - 65, 0, 0, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 0, 0, 128, 63, - 29, 0, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 1, 64, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 7, - 18, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 0, 0, 128, 63, - 56, 0, 0, 7, 242, 0, 16, 0, - 0, 0, 0, 0, 6, 0, 16, 0, - 0, 0, 0, 0, 70, 30, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -242, 32, 16, 0, 0, 0, 0, 0, - 70, 14, 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 1, 0, 0, 0, 70, 14, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -242, 32, 16, 0, 2, 0, 0, 0, - 70, 14, 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 3, 0, 0, 0, 70, 14, 16, 0, - 0, 0, 0, 0, 62, 0, 0, 1, - 83, 84, 65, 84, 116, 0, 0, 0, - 11, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 6, 0, 0, 0, - 5, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 82, 68, 69, 70, - 80, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 28, 0, 0, 0, 0, 4, 255, 255, - 0, 65, 0, 0, 28, 0, 0, 0, - 77, 105, 99, 114, 111, 115, 111, 102, -116, 32, 40, 82, 41, 32, 72, 76, - 83, 76, 32, 83, 104, 97, 100, 101, -114, 32, 67, 111, 109, 112, 105, 108, -101, 114, 32, 54, 46, 51, 46, 57, - 54, 48, 48, 46, 49, 54, 51, 56, - 52, 0, 171, 171, 73, 83, 71, 78, - 68, 0, 0, 0, 2, 0, 0, 0, - 8, 0, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 15, 15, 0, 0, 56, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, 0, 0, - 3, 3, 0, 0, 84, 69, 88, 67, - 79, 79, 82, 68, 0, 171, 171, 171, - 79, 83, 71, 78, 116, 0, 0, 0, - 4, 0, 0, 0, 8, 0, 0, 0, -104, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 0, 0, 0, -104, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 15, 0, 0, 0, -104, 0, 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 2, 0, 0, 0, 15, 0, 0, 0, -104, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 3, 0, 0, 0, 15, 0, 0, 0, - 83, 86, 95, 84, 97, 114, 103, 101, -116, 0, 171, 171, 68, 88, 66, 67, -171, 76, 90, 152, 95, 120, 80, 155, -185, 88, 30, 71, 14, 112, 82, 161, - 1, 0, 0, 0, 48, 5, 0, 0, - 6, 0, 0, 0, 56, 0, 0, 0, -108, 1, 0, 0, 12, 3, 0, 0, -136, 3, 0, 0, 92, 4, 0, 0, -192, 4, 0, 0, 65, 111, 110, 57, - 44, 1, 0, 0, 44, 1, 0, 0, - 0, 2, 254, 255, 248, 0, 0, 0, - 52, 0, 0, 0, 1, 0, 36, 0, - 0, 0, 48, 0, 0, 0, 48, 0, - 0, 0, 36, 0, 1, 0, 48, 0, - 0, 0, 0, 0, 4, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 254, 255, 81, 0, 0, 5, - 5, 0, 15, 160, 0, 0, 0, 63, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 31, 0, 0, 2, - 5, 0, 0, 128, 0, 0, 15, 144, - 31, 0, 0, 2, 5, 0, 1, 128, - 1, 0, 15, 144, 31, 0, 0, 2, - 5, 0, 2, 128, 2, 0, 15, 144, - 5, 0, 0, 3, 0, 0, 7, 224, - 0, 0, 255, 144, 0, 0, 228, 144, - 9, 0, 0, 3, 0, 0, 1, 128, - 3, 0, 228, 160, 1, 0, 228, 144, - 9, 0, 0, 3, 0, 0, 2, 128, - 4, 0, 228, 160, 1, 0, 228, 144, - 2, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 85, 128, 0, 0, 0, 128, - 5, 0, 0, 3, 0, 0, 4, 192, - 0, 0, 0, 128, 5, 0, 0, 160, - 9, 0, 0, 3, 0, 0, 1, 128, - 2, 0, 228, 160, 1, 0, 228, 144, - 1, 0, 0, 2, 1, 0, 2, 128, - 0, 0, 0, 129, 9, 0, 0, 3, - 1, 0, 1, 128, 1, 0, 228, 160, - 1, 0, 228, 144, 4, 0, 0, 4, - 0, 0, 3, 192, 0, 0, 85, 128, - 0, 0, 228, 160, 1, 0, 228, 128, - 1, 0, 0, 2, 0, 0, 8, 192, - 0, 0, 85, 128, 1, 0, 0, 2, - 0, 0, 8, 224, 0, 0, 255, 144, - 1, 0, 0, 2, 1, 0, 3, 224, - 2, 0, 228, 144, 255, 255, 0, 0, - 83, 72, 68, 82, 152, 1, 0, 0, - 64, 0, 1, 0, 102, 0, 0, 0, - 89, 0, 0, 4, 70, 142, 32, 0, - 0, 0, 0, 0, 4, 0, 0, 0, - 95, 0, 0, 3, 242, 16, 16, 0, - 0, 0, 0, 0, 95, 0, 0, 3, -242, 16, 16, 0, 1, 0, 0, 0, - 95, 0, 0, 3, 50, 16, 16, 0, - 2, 0, 0, 0, 101, 0, 0, 3, -242, 32, 16, 0, 0, 0, 0, 0, -101, 0, 0, 3, 50, 32, 16, 0, - 1, 0, 0, 0, 103, 0, 0, 4, -242, 32, 16, 0, 2, 0, 0, 0, - 1, 0, 0, 0, 104, 0, 0, 2, - 1, 0, 0, 0, 56, 0, 0, 7, -114, 32, 16, 0, 0, 0, 0, 0, -246, 31, 16, 0, 0, 0, 0, 0, - 70, 18, 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 130, 32, 16, 0, - 0, 0, 0, 0, 58, 16, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, - 50, 32, 16, 0, 1, 0, 0, 0, - 70, 16, 16, 0, 2, 0, 0, 0, - 17, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 54, 0, 0, 6, 34, 32, 16, 0, - 2, 0, 0, 0, 10, 0, 16, 128, - 65, 0, 0, 0, 0, 0, 0, 0, - 17, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 2, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 17, 0, 0, 8, 34, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 0, 0, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 26, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -130, 32, 16, 0, 2, 0, 0, 0, - 26, 0, 16, 0, 0, 0, 0, 0, - 56, 0, 0, 7, 66, 32, 16, 0, - 2, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 1, 64, 0, 0, - 0, 0, 0, 63, 17, 0, 0, 8, - 18, 32, 16, 0, 2, 0, 0, 0, - 70, 142, 32, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 30, 16, 0, - 1, 0, 0, 0, 62, 0, 0, 1, - 83, 84, 65, 84, 116, 0, 0, 0, - 12, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 6, 0, 0, 0, - 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 82, 68, 69, 70, -204, 0, 0, 0, 1, 0, 0, 0, - 72, 0, 0, 0, 1, 0, 0, 0, - 28, 0, 0, 0, 0, 4, 254, 255, - 0, 65, 0, 0, 152, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 36, 71, 108, 111, 98, 97, 108, 115, - 0, 171, 171, 171, 60, 0, 0, 0, - 1, 0, 0, 0, 96, 0, 0, 0, - 64, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 120, 0, 0, 0, - 0, 0, 0, 0, 64, 0, 0, 0, - 2, 0, 0, 0, 136, 0, 0, 0, - 0, 0, 0, 0, 95, 67, 67, 95, - 77, 86, 80, 77, 97, 116, 114, 105, -120, 0, 171, 171, 3, 0, 3, 0, - 4, 0, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 77, 105, 99, 114, -111, 115, 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, 32, 83, -104, 97, 100, 101, 114, 32, 67, 111, -109, 112, 105, 108, 101, 114, 32, 54, - 46, 51, 46, 57, 54, 48, 48, 46, - 49, 54, 51, 56, 52, 0, 171, 171, - 73, 83, 71, 78, 92, 0, 0, 0, - 3, 0, 0, 0, 8, 0, 0, 0, - 80, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 15, 0, 0, - 80, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 15, 15, 0, 0, - 80, 0, 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 2, 0, 0, 0, 3, 3, 0, 0, - 84, 69, 88, 67, 79, 79, 82, 68, - 0, 171, 171, 171, 79, 83, 71, 78, -104, 0, 0, 0, 3, 0, 0, 0, - 8, 0, 0, 0, 80, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 80, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, 0, 0, - 3, 12, 0, 0, 89, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 3, 0, 0, 0, 2, 0, 0, 0, - 15, 0, 0, 0, 84, 69, 88, 67, - 79, 79, 82, 68, 0, 83, 86, 95, - 80, 111, 115, 105, 116, 105, 111, 110, - 0, 171, 171, 171, -}; - -const unsigned char s_96ED7DE7250A36B8CE0EF03106BD399F9992497A[] = { +const unsigned char s_7B67DD242152D35ACC079265FAD9D03DC98182DE[] = { 166, 147, 0, 0, 142, 9, 2, 1, 0, 128, 0, 0, 82, 139, 0, 0, @@ -2509,278 +2469,277 @@ const unsigned char s_96ED7DE7250A36B8CE0EF03106BD399F9992497A[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 0, 92, 139, 0, 0, -242, 141, 0, 0, 12, 0, 0, 0, - 67, 67, 95, 77, 86, 80, 77, 97, -116, 114, 105, 120, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 4, 0, 0, 0, 94, 139, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, - 67, 67, 95, 84, 101, 120, 116, 117, -114, 101, 48, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 2, 0, 0, 0, 12, - 0, 0, 0, 67, 67, 95, 77, 86, - 80, 77, 97, 116, 114, 105, 120, 0, - 0, 0, 0, 0, 0, 0, 0, 11, - 0, 0, 0, 67, 67, 95, 84, 101, -120, 116, 117, 114, 101, 48, 0, 0, - 0, 0, 1, 0, 0, 0, 248, 3, - 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 136, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 88, 66, 67, 11, 95, - 74, 206, 145, 124, 32, 219, 67, 19, - 26, 23, 189, 75, 35, 86, 1, 0, - 0, 0, 248, 3, 0, 0, 6, 0, - 0, 0, 56, 0, 0, 0, 228, 0, - 0, 0, 244, 1, 0, 0, 112, 2, - 0, 0, 48, 3, 0, 0, 124, 3, - 0, 0, 65, 111, 110, 57, 164, 0, - 0, 0, 164, 0, 0, 0, 0, 2, -255, 255, 124, 0, 0, 0, 40, 0, - 0, 0, 0, 0, 40, 0, 0, 0, - 40, 0, 0, 0, 40, 0, 1, 0, - 36, 0, 0, 0, 40, 0, 0, 0, - 0, 0, 1, 2, 255, 255, 31, 0, - 0, 2, 0, 0, 0, 128, 0, 0, - 15, 176, 31, 0, 0, 2, 0, 0, - 0, 128, 1, 0, 3, 176, 31, 0, - 0, 2, 0, 0, 0, 144, 0, 8, - 15, 160, 66, 0, 0, 3, 0, 0, - 15, 128, 1, 0, 228, 176, 0, 8, -228, 160, 5, 0, 0, 3, 0, 0, - 15, 128, 0, 0, 228, 128, 0, 0, -228, 176, 1, 0, 0, 2, 0, 8, - 15, 128, 0, 0, 228, 128, 1, 0, - 0, 2, 1, 8, 15, 128, 0, 0, -228, 128, 1, 0, 0, 2, 2, 8, - 15, 128, 0, 0, 228, 128, 1, 0, - 0, 2, 3, 8, 15, 128, 0, 0, -228, 128, 255, 255, 0, 0, 83, 72, - 68, 82, 8, 1, 0, 0, 64, 0, - 0, 0, 66, 0, 0, 0, 90, 0, - 0, 3, 0, 96, 16, 0, 0, 0, - 0, 0, 88, 24, 0, 4, 0, 112, - 16, 0, 0, 0, 0, 0, 85, 85, - 0, 0, 98, 16, 0, 3, 242, 16, - 16, 0, 0, 0, 0, 0, 98, 16, - 0, 3, 50, 16, 16, 0, 1, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 0, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 1, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 2, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 3, 0, - 0, 0, 104, 0, 0, 2, 1, 0, - 0, 0, 69, 0, 0, 9, 242, 0, - 16, 0, 0, 0, 0, 0, 70, 16, - 16, 0, 1, 0, 0, 0, 70, 126, - 16, 0, 0, 0, 0, 0, 0, 96, - 16, 0, 0, 0, 0, 0, 56, 0, - 0, 7, 242, 0, 16, 0, 0, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 70, 30, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 0, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 1, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 2, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 3, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 62, 0, 0, 1, 83, 84, - 65, 84, 116, 0, 0, 0, 7, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 6, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 68, 69, 70, 184, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 28, 0, - 0, 0, 0, 4, 255, 255, 0, 65, - 0, 0, 134, 0, 0, 0, 92, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 1, 0, 0, 0, 113, 0, - 0, 0, 2, 0, 0, 0, 5, 0, - 0, 0, 4, 0, 0, 0, 255, 255, -255, 255, 0, 0, 0, 0, 1, 0, - 0, 0, 13, 0, 0, 0, 115, 97, -109, 112, 108, 101, 114, 95, 95, 67, +242, 141, 0, 0, 10, 0, 0, 0, + 67, 67, 95, 80, 77, 97, 116, 114, +105, 120, 0, 0, 0, 0, 255, 255, +255, 255, 0, 0, 0, 0, 4, 0, + 0, 0, 94, 139, 0, 0, 0, 0, + 0, 0, 11, 0, 0, 0, 67, 67, + 95, 84, 101, 120, 116, 117, 114, 101, + 48, 0, 0, 0, 0, 0, 0, 0, + 0, 255, 255, 255, 255, 1, 0, 0, + 0, 2, 0, 0, 0, 10, 0, 0, + 0, 67, 67, 95, 80, 77, 97, 116, +114, 105, 120, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 0, 0, 0, 67, 67, 95, 84, 101, 120, 116, 117, 114, -101, 48, 0, 116, 101, 120, 116, 117, -114, 101, 95, 95, 67, 67, 95, 84, -101, 120, 116, 117, 114, 101, 48, 0, - 77, 105, 99, 114, 111, 115, 111, 102, -116, 32, 40, 82, 41, 32, 72, 76, - 83, 76, 32, 83, 104, 97, 100, 101, -114, 32, 67, 111, 109, 112, 105, 108, -101, 114, 32, 54, 46, 51, 46, 57, - 54, 48, 48, 46, 49, 54, 51, 56, - 52, 0, 73, 83, 71, 78, 68, 0, - 0, 0, 2, 0, 0, 0, 8, 0, - 0, 0, 56, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 15, 15, - 0, 0, 56, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, 3, 3, - 0, 0, 84, 69, 88, 67, 79, 79, - 82, 68, 0, 171, 171, 171, 79, 83, - 71, 78, 116, 0, 0, 0, 4, 0, - 0, 0, 8, 0, 0, 0, 104, 0, +101, 48, 0, 0, 0, 0, 1, 0, + 0, 0, 248, 3, 0, 0, 0, 5, + 0, 0, 0, 0, 0, 0, 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 1, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 2, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 3, 0, - 0, 0, 15, 0, 0, 0, 83, 86, - 95, 84, 97, 114, 103, 101, 116, 0, -171, 171, 68, 88, 66, 67, 235, 56, -180, 223, 125, 231, 231, 218, 70, 75, - 12, 63, 200, 233, 69, 121, 1, 0, - 0, 0, 4, 5, 0, 0, 6, 0, - 0, 0, 56, 0, 0, 0, 92, 1, - 0, 0, 224, 2, 0, 0, 92, 3, - 0, 0, 48, 4, 0, 0, 148, 4, - 0, 0, 65, 111, 110, 57, 28, 1, - 0, 0, 28, 1, 0, 0, 0, 2, -254, 255, 232, 0, 0, 0, 52, 0, - 0, 0, 1, 0, 36, 0, 0, 0, - 48, 0, 0, 0, 48, 0, 0, 0, - 36, 0, 1, 0, 48, 0, 0, 0, - 0, 0, 4, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 2, -254, 255, 81, 0, 0, 5, 5, 0, - 15, 160, 0, 0, 0, 63, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 2, 5, 0, - 0, 128, 0, 0, 15, 144, 31, 0, - 0, 2, 5, 0, 1, 128, 1, 0, - 15, 144, 31, 0, 0, 2, 5, 0, - 2, 128, 2, 0, 15, 144, 9, 0, - 0, 3, 0, 0, 1, 128, 3, 0, -228, 160, 1, 0, 228, 144, 9, 0, - 0, 3, 0, 0, 2, 128, 4, 0, -228, 160, 1, 0, 228, 144, 2, 0, - 0, 3, 0, 0, 1, 128, 0, 0, - 85, 128, 0, 0, 0, 128, 5, 0, - 0, 3, 0, 0, 4, 192, 0, 0, - 0, 128, 5, 0, 0, 160, 9, 0, - 0, 3, 0, 0, 1, 128, 2, 0, -228, 160, 1, 0, 228, 144, 1, 0, - 0, 2, 1, 0, 2, 128, 0, 0, - 0, 129, 9, 0, 0, 3, 1, 0, - 1, 128, 1, 0, 228, 160, 1, 0, -228, 144, 4, 0, 0, 4, 0, 0, - 3, 192, 0, 0, 85, 128, 0, 0, -228, 160, 1, 0, 228, 128, 1, 0, - 0, 2, 0, 0, 8, 192, 0, 0, - 85, 128, 1, 0, 0, 2, 0, 0, - 15, 224, 0, 0, 228, 144, 1, 0, - 0, 2, 1, 0, 3, 224, 2, 0, -228, 144, 255, 255, 0, 0, 83, 72, - 68, 82, 124, 1, 0, 0, 64, 0, - 1, 0, 95, 0, 0, 0, 89, 0, - 0, 4, 70, 142, 32, 0, 0, 0, - 0, 0, 4, 0, 0, 0, 95, 0, + 0, 0, 0, 0, 0, 0, 68, 88, + 66, 67, 11, 95, 74, 206, 145, 124, + 32, 219, 67, 19, 26, 23, 189, 75, + 35, 86, 1, 0, 0, 0, 248, 3, + 0, 0, 6, 0, 0, 0, 56, 0, + 0, 0, 228, 0, 0, 0, 244, 1, + 0, 0, 112, 2, 0, 0, 48, 3, + 0, 0, 124, 3, 0, 0, 65, 111, +110, 57, 164, 0, 0, 0, 164, 0, + 0, 0, 0, 2, 255, 255, 124, 0, + 0, 0, 40, 0, 0, 0, 0, 0, + 40, 0, 0, 0, 40, 0, 0, 0, + 40, 0, 1, 0, 36, 0, 0, 0, + 40, 0, 0, 0, 0, 0, 1, 2, +255, 255, 31, 0, 0, 2, 0, 0, + 0, 128, 0, 0, 15, 176, 31, 0, + 0, 2, 0, 0, 0, 128, 1, 0, + 3, 176, 31, 0, 0, 2, 0, 0, + 0, 144, 0, 8, 15, 160, 66, 0, + 0, 3, 0, 0, 15, 128, 1, 0, +228, 176, 0, 8, 228, 160, 5, 0, + 0, 3, 0, 0, 15, 128, 0, 0, +228, 128, 0, 0, 228, 176, 1, 0, + 0, 2, 0, 8, 15, 128, 0, 0, +228, 128, 1, 0, 0, 2, 1, 8, + 15, 128, 0, 0, 228, 128, 1, 0, + 0, 2, 2, 8, 15, 128, 0, 0, +228, 128, 1, 0, 0, 2, 3, 8, + 15, 128, 0, 0, 228, 128, 255, 255, + 0, 0, 83, 72, 68, 82, 8, 1, + 0, 0, 64, 0, 0, 0, 66, 0, + 0, 0, 90, 0, 0, 3, 0, 96, + 16, 0, 0, 0, 0, 0, 88, 24, + 0, 4, 0, 112, 16, 0, 0, 0, + 0, 0, 85, 85, 0, 0, 98, 16, 0, 3, 242, 16, 16, 0, 0, 0, - 0, 0, 95, 0, 0, 3, 242, 16, - 16, 0, 1, 0, 0, 0, 95, 0, - 0, 3, 50, 16, 16, 0, 2, 0, + 0, 0, 98, 16, 0, 3, 50, 16, + 16, 0, 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 0, 0, 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 0, 0, 0, 0, 101, 0, - 0, 3, 50, 32, 16, 0, 1, 0, - 0, 0, 103, 0, 0, 4, 242, 32, - 16, 0, 2, 0, 0, 0, 1, 0, - 0, 0, 104, 0, 0, 2, 1, 0, - 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 2, 0, + 0, 0, 101, 0, 0, 3, 242, 32, + 16, 0, 3, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, 69, 0, + 0, 9, 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, 1, 0, + 0, 0, 70, 126, 16, 0, 0, 0, + 0, 0, 0, 96, 16, 0, 0, 0, + 0, 0, 56, 0, 0, 7, 242, 0, + 16, 0, 0, 0, 0, 0, 70, 14, 16, 0, 0, 0, 0, 0, 70, 30, 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 50, 32, 16, 0, 1, 0, - 0, 0, 70, 16, 16, 0, 2, 0, - 0, 0, 17, 0, 0, 8, 18, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 54, 0, 0, 6, 34, 32, - 16, 0, 2, 0, 0, 0, 10, 0, - 16, 128, 65, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 8, 18, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 17, 0, 0, 8, 34, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 0, 0, 0, 7, 18, 0, - 16, 0, 0, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, 10, 0, + 0, 5, 242, 32, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 130, 32, 16, 0, 2, 0, - 0, 0, 26, 0, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 7, 66, 32, - 16, 0, 2, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 1, 64, - 0, 0, 0, 0, 0, 63, 17, 0, - 0, 8, 18, 32, 16, 0, 2, 0, - 0, 0, 70, 142, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 70, 30, - 16, 0, 1, 0, 0, 0, 62, 0, + 0, 5, 242, 32, 16, 0, 2, 0, + 0, 0, 70, 14, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 242, 32, + 16, 0, 3, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, 62, 0, 0, 1, 83, 84, 65, 84, 116, 0, - 0, 0, 11, 0, 0, 0, 1, 0, + 0, 0, 7, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 6, 0, - 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 68, - 69, 70, 204, 0, 0, 0, 1, 0, - 0, 0, 72, 0, 0, 0, 1, 0, + 69, 70, 184, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 28, 0, 0, 0, 0, 4, -254, 255, 0, 65, 0, 0, 152, 0, - 0, 0, 60, 0, 0, 0, 0, 0, +255, 255, 0, 65, 0, 0, 134, 0, + 0, 0, 92, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 1, 0, + 0, 0, 113, 0, 0, 0, 2, 0, + 0, 0, 5, 0, 0, 0, 4, 0, + 0, 0, 255, 255, 255, 255, 0, 0, + 0, 0, 1, 0, 0, 0, 13, 0, + 0, 0, 115, 97, 109, 112, 108, 101, +114, 95, 95, 67, 67, 95, 84, 101, +120, 116, 117, 114, 101, 48, 0, 116, +101, 120, 116, 117, 114, 101, 95, 95, + 67, 67, 95, 84, 101, 120, 116, 117, +114, 101, 48, 0, 77, 105, 99, 114, +111, 115, 111, 102, 116, 32, 40, 82, + 41, 32, 72, 76, 83, 76, 32, 83, +104, 97, 100, 101, 114, 32, 67, 111, +109, 112, 105, 108, 101, 114, 32, 54, + 46, 51, 46, 57, 54, 48, 48, 46, + 49, 54, 51, 56, 52, 0, 73, 83, + 71, 78, 68, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, 56, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 15, 15, 0, 0, 56, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 1, 0, + 0, 0, 3, 3, 0, 0, 84, 69, + 88, 67, 79, 79, 82, 68, 0, 171, +171, 171, 79, 83, 71, 78, 116, 0, + 0, 0, 4, 0, 0, 0, 8, 0, + 0, 0, 104, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 15, 0, + 0, 0, 104, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, 15, 0, + 0, 0, 104, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 2, 0, 0, 0, 15, 0, + 0, 0, 104, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, 15, 0, + 0, 0, 83, 86, 95, 84, 97, 114, +103, 101, 116, 0, 171, 171, 68, 88, + 66, 67, 53, 89, 218, 251, 179, 193, +226, 187, 197, 89, 218, 37, 36, 176, +206, 80, 1, 0, 0, 0, 0, 5, + 0, 0, 6, 0, 0, 0, 56, 0, + 0, 0, 92, 1, 0, 0, 224, 2, + 0, 0, 92, 3, 0, 0, 44, 4, + 0, 0, 144, 4, 0, 0, 65, 111, +110, 57, 28, 1, 0, 0, 28, 1, + 0, 0, 0, 2, 254, 255, 232, 0, + 0, 0, 52, 0, 0, 0, 1, 0, + 36, 0, 0, 0, 48, 0, 0, 0, + 48, 0, 0, 0, 36, 0, 1, 0, + 48, 0, 0, 0, 0, 0, 4, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 2, 254, 255, 81, 0, + 0, 5, 5, 0, 15, 160, 0, 0, + 0, 63, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 31, 0, + 0, 2, 5, 0, 0, 128, 0, 0, + 15, 144, 31, 0, 0, 2, 5, 0, + 1, 128, 1, 0, 15, 144, 31, 0, + 0, 2, 5, 0, 2, 128, 2, 0, + 15, 144, 9, 0, 0, 3, 0, 0, + 1, 128, 3, 0, 228, 160, 1, 0, +228, 144, 9, 0, 0, 3, 0, 0, + 2, 128, 4, 0, 228, 160, 1, 0, +228, 144, 2, 0, 0, 3, 0, 0, + 1, 128, 0, 0, 85, 128, 0, 0, + 0, 128, 5, 0, 0, 3, 0, 0, + 4, 192, 0, 0, 0, 128, 5, 0, + 0, 160, 9, 0, 0, 3, 0, 0, + 1, 128, 2, 0, 228, 160, 1, 0, +228, 144, 1, 0, 0, 2, 1, 0, + 2, 128, 0, 0, 0, 129, 9, 0, + 0, 3, 1, 0, 1, 128, 1, 0, +228, 160, 1, 0, 228, 144, 4, 0, + 0, 4, 0, 0, 3, 192, 0, 0, + 85, 128, 0, 0, 228, 160, 1, 0, +228, 128, 1, 0, 0, 2, 0, 0, + 8, 192, 0, 0, 85, 128, 1, 0, + 0, 2, 0, 0, 15, 224, 0, 0, +228, 144, 1, 0, 0, 2, 1, 0, + 3, 224, 2, 0, 228, 144, 255, 255, + 0, 0, 83, 72, 68, 82, 124, 1, + 0, 0, 64, 0, 1, 0, 95, 0, + 0, 0, 89, 0, 0, 4, 70, 142, + 32, 0, 0, 0, 0, 0, 4, 0, + 0, 0, 95, 0, 0, 3, 242, 16, + 16, 0, 0, 0, 0, 0, 95, 0, + 0, 3, 242, 16, 16, 0, 1, 0, + 0, 0, 95, 0, 0, 3, 50, 16, + 16, 0, 2, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, 0, 0, + 0, 0, 101, 0, 0, 3, 50, 32, + 16, 0, 1, 0, 0, 0, 103, 0, + 0, 4, 242, 32, 16, 0, 2, 0, + 0, 0, 1, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, 54, 0, + 0, 5, 242, 32, 16, 0, 0, 0, + 0, 0, 70, 30, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 50, 32, + 16, 0, 1, 0, 0, 0, 70, 16, + 16, 0, 2, 0, 0, 0, 17, 0, + 0, 8, 18, 0, 16, 0, 0, 0, + 0, 0, 70, 142, 32, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 70, 30, + 16, 0, 1, 0, 0, 0, 54, 0, + 0, 6, 34, 32, 16, 0, 2, 0, + 0, 0, 10, 0, 16, 128, 65, 0, + 0, 0, 0, 0, 0, 0, 17, 0, + 0, 8, 18, 0, 16, 0, 0, 0, + 0, 0, 70, 142, 32, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 70, 30, + 16, 0, 1, 0, 0, 0, 17, 0, + 0, 8, 34, 0, 16, 0, 0, 0, + 0, 0, 70, 142, 32, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 70, 30, + 16, 0, 1, 0, 0, 0, 0, 0, + 0, 7, 18, 0, 16, 0, 0, 0, + 0, 0, 26, 0, 16, 0, 0, 0, + 0, 0, 10, 0, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 130, 32, + 16, 0, 2, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, 56, 0, + 0, 7, 66, 32, 16, 0, 2, 0, + 0, 0, 10, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, 0, 0, + 0, 63, 17, 0, 0, 8, 18, 32, + 16, 0, 2, 0, 0, 0, 70, 142, + 32, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 70, 30, 16, 0, 1, 0, + 0, 0, 62, 0, 0, 1, 83, 84, + 65, 84, 116, 0, 0, 0, 11, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 36, 71, 108, 111, 98, 97, -108, 115, 0, 171, 171, 171, 60, 0, - 0, 0, 1, 0, 0, 0, 96, 0, - 0, 0, 64, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 120, 0, - 0, 0, 0, 0, 0, 0, 64, 0, - 0, 0, 2, 0, 0, 0, 136, 0, - 0, 0, 0, 0, 0, 0, 95, 67, - 67, 95, 77, 86, 80, 77, 97, 116, -114, 105, 120, 0, 171, 171, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 82, 68, 69, 70, 200, 0, + 0, 0, 1, 0, 0, 0, 72, 0, + 0, 0, 1, 0, 0, 0, 28, 0, + 0, 0, 0, 4, 254, 255, 0, 65, + 0, 0, 148, 0, 0, 0, 60, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 36, 71, +108, 111, 98, 97, 108, 115, 0, 171, +171, 171, 60, 0, 0, 0, 1, 0, + 0, 0, 96, 0, 0, 0, 64, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 120, 0, 0, 0, 0, 0, + 0, 0, 64, 0, 0, 0, 2, 0, + 0, 0, 132, 0, 0, 0, 0, 0, + 0, 0, 95, 67, 67, 95, 80, 77, + 97, 116, 114, 105, 120, 0, 3, 0, 3, 0, 4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 105, 99, 114, 111, 115, 111, 102, 116, 32, @@ -2818,7 +2777,7 @@ const unsigned char s_96ED7DE7250A36B8CE0EF03106BD399F9992497A[] = { 111, 110, 0, 171, 171, 171, }; -const unsigned char s_A0A1EDA5193F66BAC3038D55186A3ADF35F4AB4C[] = { +const unsigned char s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5[] = { 166, 147, 0, 0, 142, 9, 2, 1, 0, 128, 0, 0, 82, 139, 0, 0, @@ -2897,7 +2856,7 @@ const unsigned char s_A0A1EDA5193F66BAC3038D55186A3ADF35F4AB4C[] = { 114, 101, 48, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 0, 0, 82, 139, 0, 0, 240, -141, 0, 0, 11, 0, 0, 0, 118, +141, 0, 0, 11, 0, 0, 0, 117, 95, 116, 101, 120, 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, @@ -2908,15 +2867,15 @@ const unsigned char s_A0A1EDA5193F66BAC3038D55186A3ADF35F4AB4C[] = { 0, 0, 67, 67, 95, 84, 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 11, 0, 0, - 0, 118, 95, 116, 101, 120, 116, 67, + 0, 117, 95, 116, 101, 120, 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 240, 4, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, -212, 136, 0, 0, 0, 0, 0, 0, + 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 88, 66, 67, 47, 94, 38, 76, - 14, 168, 60, 33, 250, 141, 97, 162, - 69, 165, 114, 19, 1, 0, 0, 0, + 68, 88, 66, 67, 134, 66, 128, 226, +107, 172, 247, 161, 241, 207, 89, 240, +109, 104, 128, 121, 1, 0, 0, 0, 240, 4, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 16, 1, 0, 0, 112, 2, 0, 0, 236, 2, 0, 0, @@ -3036,7 +2995,7 @@ const unsigned char s_A0A1EDA5193F66BAC3038D55186A3ADF35F4AB4C[] = { 0, 0, 0, 0, 224, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 2, 0, 0, 0, 240, 0, 0, 0, - 0, 0, 0, 0, 95, 118, 95, 116, + 0, 0, 0, 0, 95, 117, 95, 116, 101, 120, 116, 67, 111, 108, 111, 114, 0, 171, 171, 171, 1, 0, 3, 0, 1, 0, 4, 0, 0, 0, 0, 0, @@ -3235,390 +3194,7 @@ const unsigned char s_A0A1EDA5193F66BAC3038D55186A3ADF35F4AB4C[] = { 0, 171, 171, 171, }; -const unsigned char s_B3632567FE5B23C2808A75D03CF8354DC9DB6137[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 255, 255, 255, 255, 80, 139, - 0, 0, 10, 0, 0, 0, 97, 95, -116, 101, 120, 67, 111, 111, 114, 100, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 3, 0, 0, 0, 92, 139, 0, - 0, 242, 141, 0, 0, 12, 0, 0, - 0, 67, 67, 95, 77, 86, 80, 77, - 97, 116, 114, 105, 120, 0, 0, 0, - 0, 255, 255, 255, 255, 0, 0, 0, - 0, 4, 0, 0, 0, 94, 139, 0, - 0, 0, 0, 0, 0, 11, 0, 0, - 0, 67, 67, 95, 84, 101, 120, 116, -117, 114, 101, 48, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 82, 139, 0, 0, -240, 141, 0, 0, 7, 0, 0, 0, -117, 95, 99, 111, 108, 111, 114, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 1, 0, 0, 0, 3, - 0, 0, 0, 12, 0, 0, 0, 67, - 67, 95, 77, 86, 80, 77, 97, 116, -114, 105, 120, 0, 0, 0, 0, 0, - 0, 0, 0, 11, 0, 0, 0, 67, - 67, 95, 84, 101, 120, 116, 117, 114, -101, 48, 0, 0, 0, 0, 1, 0, - 0, 0, 7, 0, 0, 0, 117, 95, - 99, 111, 108, 111, 114, 0, 0, 0, - 0, 2, 0, 0, 0, 96, 4, 0, - 0, 144, 4, 0, 0, 0, 0, 0, - 0, 212, 136, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 68, 88, 66, 67, 157, 116, 105, - 89, 118, 135, 249, 239, 42, 226, 184, - 78, 220, 105, 236, 28, 1, 0, 0, - 0, 96, 4, 0, 0, 6, 0, 0, - 0, 56, 0, 0, 0, 228, 0, 0, - 0, 252, 1, 0, 0, 120, 2, 0, - 0, 176, 3, 0, 0, 228, 3, 0, - 0, 65, 111, 110, 57, 164, 0, 0, - 0, 164, 0, 0, 0, 0, 2, 255, -255, 112, 0, 0, 0, 52, 0, 0, - 0, 1, 0, 40, 0, 0, 0, 52, - 0, 0, 0, 52, 0, 1, 0, 36, - 0, 0, 0, 52, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 1, 2, 255, -255, 31, 0, 0, 2, 0, 0, 0, -128, 0, 0, 3, 176, 31, 0, 0, - 2, 0, 0, 0, 144, 0, 8, 15, -160, 66, 0, 0, 3, 0, 0, 15, -128, 0, 0, 228, 176, 0, 8, 228, -160, 5, 0, 0, 3, 0, 0, 15, -128, 0, 0, 228, 128, 0, 0, 228, -160, 1, 0, 0, 2, 0, 8, 15, -128, 0, 0, 228, 128, 1, 0, 0, - 2, 1, 8, 15, 128, 0, 0, 228, -128, 1, 0, 0, 2, 2, 8, 15, -128, 0, 0, 228, 128, 1, 0, 0, - 2, 3, 8, 15, 128, 0, 0, 228, -128, 255, 255, 0, 0, 83, 72, 68, - 82, 16, 1, 0, 0, 64, 0, 0, - 0, 68, 0, 0, 0, 89, 0, 0, - 4, 70, 142, 32, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 90, 0, 0, - 3, 0, 96, 16, 0, 0, 0, 0, - 0, 88, 24, 0, 4, 0, 112, 16, - 0, 0, 0, 0, 0, 85, 85, 0, - 0, 98, 16, 0, 3, 50, 16, 16, - 0, 0, 0, 0, 0, 101, 0, 0, - 3, 242, 32, 16, 0, 0, 0, 0, - 0, 101, 0, 0, 3, 242, 32, 16, - 0, 1, 0, 0, 0, 101, 0, 0, - 3, 242, 32, 16, 0, 2, 0, 0, - 0, 101, 0, 0, 3, 242, 32, 16, - 0, 3, 0, 0, 0, 104, 0, 0, - 2, 1, 0, 0, 0, 69, 0, 0, - 9, 242, 0, 16, 0, 0, 0, 0, - 0, 70, 16, 16, 0, 0, 0, 0, - 0, 70, 126, 16, 0, 0, 0, 0, - 0, 0, 96, 16, 0, 0, 0, 0, - 0, 56, 0, 0, 8, 242, 0, 16, - 0, 0, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 70, 142, 32, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 54, 0, 0, 5, 242, 32, 16, - 0, 0, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 5, 242, 32, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 0, 0, 0, - 0, 54, 0, 0, 5, 242, 32, 16, - 0, 2, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 5, 242, 32, 16, 0, 3, 0, 0, - 0, 70, 14, 16, 0, 0, 0, 0, - 0, 62, 0, 0, 1, 83, 84, 65, - 84, 116, 0, 0, 0, 7, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 5, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 82, 68, 69, 70, 48, 1, 0, - 0, 1, 0, 0, 0, 176, 0, 0, - 0, 3, 0, 0, 0, 28, 0, 0, - 0, 0, 4, 255, 255, 0, 65, 0, - 0, 252, 0, 0, 0, 124, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 1, 0, 0, 0, 145, 0, 0, - 0, 2, 0, 0, 0, 5, 0, 0, - 0, 4, 0, 0, 0, 255, 255, 255, -255, 0, 0, 0, 0, 1, 0, 0, - 0, 13, 0, 0, 0, 166, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 115, 97, 109, -112, 108, 101, 114, 95, 95, 67, 67, - 95, 84, 101, 120, 116, 117, 114, 101, - 48, 0, 116, 101, 120, 116, 117, 114, -101, 95, 95, 67, 67, 95, 84, 101, -120, 116, 117, 114, 101, 48, 0, 36, - 71, 108, 111, 98, 97, 108, 115, 0, -171, 166, 0, 0, 0, 1, 0, 0, - 0, 200, 0, 0, 0, 16, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 224, 0, 0, 0, 0, 0, 0, - 0, 16, 0, 0, 0, 2, 0, 0, - 0, 236, 0, 0, 0, 0, 0, 0, - 0, 95, 117, 95, 99, 111, 108, 111, -114, 0, 171, 171, 171, 1, 0, 3, - 0, 1, 0, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 77, 105, 99, -114, 111, 115, 111, 102, 116, 32, 40, - 82, 41, 32, 72, 76, 83, 76, 32, - 83, 104, 97, 100, 101, 114, 32, 67, -111, 109, 112, 105, 108, 101, 114, 32, - 54, 46, 51, 46, 57, 54, 48, 48, - 46, 49, 54, 51, 56, 52, 0, 171, -171, 73, 83, 71, 78, 44, 0, 0, - 0, 1, 0, 0, 0, 8, 0, 0, - 0, 32, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 3, 3, 0, - 0, 84, 69, 88, 67, 79, 79, 82, - 68, 0, 171, 171, 171, 79, 83, 71, - 78, 116, 0, 0, 0, 4, 0, 0, - 0, 8, 0, 0, 0, 104, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 15, 0, 0, 0, 104, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 1, 0, 0, - 0, 15, 0, 0, 0, 104, 0, 0, - 0, 2, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 2, 0, 0, - 0, 15, 0, 0, 0, 104, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 3, 0, 0, - 0, 15, 0, 0, 0, 83, 86, 95, - 84, 97, 114, 103, 101, 116, 0, 171, -171, 68, 88, 66, 67, 110, 14, 140, -120, 239, 110, 56, 78, 103, 37, 245, -162, 140, 151, 93, 223, 1, 0, 0, - 0, 144, 4, 0, 0, 6, 0, 0, - 0, 56, 0, 0, 0, 68, 1, 0, - 0, 156, 2, 0, 0, 24, 3, 0, - 0, 236, 3, 0, 0, 56, 4, 0, - 0, 65, 111, 110, 57, 4, 1, 0, - 0, 4, 1, 0, 0, 0, 2, 254, -255, 208, 0, 0, 0, 52, 0, 0, - 0, 1, 0, 36, 0, 0, 0, 48, - 0, 0, 0, 48, 0, 0, 0, 36, - 0, 1, 0, 48, 0, 0, 0, 0, - 0, 4, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 2, 254, -255, 81, 0, 0, 5, 5, 0, 15, -160, 0, 0, 0, 63, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 31, 0, 0, 2, 5, 0, 0, -128, 0, 0, 15, 144, 31, 0, 0, - 2, 5, 0, 1, 128, 1, 0, 15, -144, 9, 0, 0, 3, 0, 0, 1, -128, 3, 0, 228, 160, 0, 0, 228, -144, 9, 0, 0, 3, 0, 0, 2, -128, 4, 0, 228, 160, 0, 0, 228, -144, 2, 0, 0, 3, 0, 0, 1, -128, 0, 0, 85, 128, 0, 0, 0, -128, 5, 0, 0, 3, 0, 0, 4, -192, 0, 0, 0, 128, 5, 0, 0, -160, 9, 0, 0, 3, 0, 0, 1, -128, 2, 0, 228, 160, 0, 0, 228, -144, 1, 0, 0, 2, 1, 0, 2, -128, 0, 0, 0, 129, 9, 0, 0, - 3, 1, 0, 1, 128, 1, 0, 228, -160, 0, 0, 228, 144, 4, 0, 0, - 4, 0, 0, 3, 192, 0, 0, 85, -128, 0, 0, 228, 160, 1, 0, 228, -128, 1, 0, 0, 2, 0, 0, 8, -192, 0, 0, 85, 128, 1, 0, 0, - 2, 0, 0, 3, 224, 1, 0, 228, -144, 255, 255, 0, 0, 83, 72, 68, - 82, 80, 1, 0, 0, 64, 0, 1, - 0, 84, 0, 0, 0, 89, 0, 0, - 4, 70, 142, 32, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 95, 0, 0, - 3, 242, 16, 16, 0, 0, 0, 0, - 0, 95, 0, 0, 3, 50, 16, 16, - 0, 1, 0, 0, 0, 101, 0, 0, - 3, 50, 32, 16, 0, 0, 0, 0, - 0, 103, 0, 0, 4, 242, 32, 16, - 0, 1, 0, 0, 0, 1, 0, 0, - 0, 104, 0, 0, 2, 1, 0, 0, - 0, 54, 0, 0, 5, 50, 32, 16, - 0, 0, 0, 0, 0, 70, 16, 16, - 0, 1, 0, 0, 0, 17, 0, 0, - 8, 18, 0, 16, 0, 0, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 70, 30, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 6, 34, 32, 16, 0, 1, 0, 0, - 0, 10, 0, 16, 128, 65, 0, 0, - 0, 0, 0, 0, 0, 17, 0, 0, - 8, 18, 0, 16, 0, 0, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, - 0, 2, 0, 0, 0, 70, 30, 16, - 0, 0, 0, 0, 0, 17, 0, 0, - 8, 34, 0, 16, 0, 0, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 70, 30, 16, - 0, 0, 0, 0, 0, 0, 0, 0, - 7, 18, 0, 16, 0, 0, 0, 0, - 0, 26, 0, 16, 0, 0, 0, 0, - 0, 10, 0, 16, 0, 0, 0, 0, - 0, 54, 0, 0, 5, 130, 32, 16, - 0, 1, 0, 0, 0, 26, 0, 16, - 0, 0, 0, 0, 0, 56, 0, 0, - 7, 66, 32, 16, 0, 1, 0, 0, - 0, 10, 0, 16, 0, 0, 0, 0, - 0, 1, 64, 0, 0, 0, 0, 0, - 63, 17, 0, 0, 8, 18, 32, 16, - 0, 1, 0, 0, 0, 70, 142, 32, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 70, 30, 16, 0, 0, 0, 0, - 0, 62, 0, 0, 1, 83, 84, 65, - 84, 116, 0, 0, 0, 10, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 7, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 82, 68, 69, 70, 204, 0, 0, - 0, 1, 0, 0, 0, 72, 0, 0, - 0, 1, 0, 0, 0, 28, 0, 0, - 0, 0, 4, 254, 255, 0, 65, 0, - 0, 152, 0, 0, 0, 60, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 36, 71, 108, -111, 98, 97, 108, 115, 0, 171, 171, -171, 60, 0, 0, 0, 1, 0, 0, - 0, 96, 0, 0, 0, 64, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 120, 0, 0, 0, 0, 0, 0, - 0, 64, 0, 0, 0, 2, 0, 0, - 0, 136, 0, 0, 0, 0, 0, 0, - 0, 95, 67, 67, 95, 77, 86, 80, - 77, 97, 116, 114, 105, 120, 0, 171, -171, 3, 0, 3, 0, 4, 0, 4, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 77, 105, 99, 114, 111, 115, 111, -102, 116, 32, 40, 82, 41, 32, 72, - 76, 83, 76, 32, 83, 104, 97, 100, -101, 114, 32, 67, 111, 109, 112, 105, -108, 101, 114, 32, 54, 46, 51, 46, - 57, 54, 48, 48, 46, 49, 54, 51, - 56, 52, 0, 171, 171, 73, 83, 71, - 78, 68, 0, 0, 0, 2, 0, 0, - 0, 8, 0, 0, 0, 56, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 15, 15, 0, 0, 56, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 1, 0, 0, - 0, 3, 3, 0, 0, 84, 69, 88, - 67, 79, 79, 82, 68, 0, 171, 171, -171, 79, 83, 71, 78, 80, 0, 0, - 0, 2, 0, 0, 0, 8, 0, 0, - 0, 56, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 3, 12, 0, - 0, 65, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 3, 0, 0, - 0, 1, 0, 0, 0, 15, 0, 0, - 0, 84, 69, 88, 67, 79, 79, 82, - 68, 0, 83, 86, 95, 80, 111, 115, -105, 116, 105, 111, 110, 0, 171, 171, -171, -}; - -const unsigned char s_C7D6F93DBEF6AC7B2792546CE7DC909CC3047DAB[] = { +const unsigned char s_92BE325B516F887D2C928EDE20ADF428DB01C038[] = { 166, 147, 0, 0, 142, 9, 2, 1, 0, 128, 0, 0, 82, 139, 0, 0, @@ -3712,7 +3288,7 @@ const unsigned char s_C7D6F93DBEF6AC7B2792546CE7DC909CC3047DAB[] = { 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 0, 5, 0, 0, 0, 0, - 0, 0, 212, 136, 0, 0, 0, 0, + 0, 0, 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, 177, 78, 120, 99, @@ -4041,7 +3617,390 @@ const unsigned char s_C7D6F93DBEF6AC7B2792546CE7DC909CC3047DAB[] = { 111, 110, 0, 171, 171, 171, }; -const unsigned char s_DEB4FBAF8139EA1475C188A08B5C6AD1C473A768[] = { +const unsigned char s_A2377A827972A5466DA8637681045D32DA8A817D[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, 80, 139, + 0, 0, 10, 0, 0, 0, 97, 95, +116, 101, 120, 67, 111, 111, 114, 100, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 3, 0, 0, 0, 92, 139, 0, + 0, 242, 141, 0, 0, 12, 0, 0, + 0, 67, 67, 95, 77, 86, 80, 77, + 97, 116, 114, 105, 120, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 4, 0, 0, 0, 94, 139, 0, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 67, 67, 95, 84, 101, 120, 116, +117, 114, 101, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 82, 139, 0, 0, +240, 141, 0, 0, 7, 0, 0, 0, +117, 95, 99, 111, 108, 111, 114, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 1, 0, 0, 0, 3, + 0, 0, 0, 12, 0, 0, 0, 67, + 67, 95, 77, 86, 80, 77, 97, 116, +114, 105, 120, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 0, 0, 0, 67, + 67, 95, 84, 101, 120, 116, 117, 114, +101, 48, 0, 0, 0, 0, 1, 0, + 0, 0, 7, 0, 0, 0, 117, 95, + 99, 111, 108, 111, 114, 0, 0, 0, + 0, 2, 0, 0, 0, 96, 4, 0, + 0, 144, 4, 0, 0, 0, 0, 0, + 0, 20, 134, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 68, 88, 66, 67, 157, 116, 105, + 89, 118, 135, 249, 239, 42, 226, 184, + 78, 220, 105, 236, 28, 1, 0, 0, + 0, 96, 4, 0, 0, 6, 0, 0, + 0, 56, 0, 0, 0, 228, 0, 0, + 0, 252, 1, 0, 0, 120, 2, 0, + 0, 176, 3, 0, 0, 228, 3, 0, + 0, 65, 111, 110, 57, 164, 0, 0, + 0, 164, 0, 0, 0, 0, 2, 255, +255, 112, 0, 0, 0, 52, 0, 0, + 0, 1, 0, 40, 0, 0, 0, 52, + 0, 0, 0, 52, 0, 1, 0, 36, + 0, 0, 0, 52, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 255, +255, 31, 0, 0, 2, 0, 0, 0, +128, 0, 0, 3, 176, 31, 0, 0, + 2, 0, 0, 0, 144, 0, 8, 15, +160, 66, 0, 0, 3, 0, 0, 15, +128, 0, 0, 228, 176, 0, 8, 228, +160, 5, 0, 0, 3, 0, 0, 15, +128, 0, 0, 228, 128, 0, 0, 228, +160, 1, 0, 0, 2, 0, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 1, 8, 15, 128, 0, 0, 228, +128, 1, 0, 0, 2, 2, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 3, 8, 15, 128, 0, 0, 228, +128, 255, 255, 0, 0, 83, 72, 68, + 82, 16, 1, 0, 0, 64, 0, 0, + 0, 68, 0, 0, 0, 89, 0, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 90, 0, 0, + 3, 0, 96, 16, 0, 0, 0, 0, + 0, 88, 24, 0, 4, 0, 112, 16, + 0, 0, 0, 0, 0, 85, 85, 0, + 0, 98, 16, 0, 3, 50, 16, 16, + 0, 0, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 0, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 1, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 2, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 3, 0, 0, 0, 104, 0, 0, + 2, 1, 0, 0, 0, 69, 0, 0, + 9, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 16, 16, 0, 0, 0, 0, + 0, 70, 126, 16, 0, 0, 0, 0, + 0, 0, 96, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 8, 242, 0, 16, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 2, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 3, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 62, 0, 0, 1, 83, 84, 65, + 84, 116, 0, 0, 0, 7, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 5, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 82, 68, 69, 70, 48, 1, 0, + 0, 1, 0, 0, 0, 176, 0, 0, + 0, 3, 0, 0, 0, 28, 0, 0, + 0, 0, 4, 255, 255, 0, 65, 0, + 0, 252, 0, 0, 0, 124, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 1, 0, 0, 0, 145, 0, 0, + 0, 2, 0, 0, 0, 5, 0, 0, + 0, 4, 0, 0, 0, 255, 255, 255, +255, 0, 0, 0, 0, 1, 0, 0, + 0, 13, 0, 0, 0, 166, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 115, 97, 109, +112, 108, 101, 114, 95, 95, 67, 67, + 95, 84, 101, 120, 116, 117, 114, 101, + 48, 0, 116, 101, 120, 116, 117, 114, +101, 95, 95, 67, 67, 95, 84, 101, +120, 116, 117, 114, 101, 48, 0, 36, + 71, 108, 111, 98, 97, 108, 115, 0, +171, 166, 0, 0, 0, 1, 0, 0, + 0, 200, 0, 0, 0, 16, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 224, 0, 0, 0, 0, 0, 0, + 0, 16, 0, 0, 0, 2, 0, 0, + 0, 236, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 99, 111, 108, 111, +114, 0, 171, 171, 171, 1, 0, 3, + 0, 1, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 77, 105, 99, +114, 111, 115, 111, 102, 116, 32, 40, + 82, 41, 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, 32, 67, +111, 109, 112, 105, 108, 101, 114, 32, + 54, 46, 51, 46, 57, 54, 48, 48, + 46, 49, 54, 51, 56, 52, 0, 171, +171, 73, 83, 71, 78, 44, 0, 0, + 0, 1, 0, 0, 0, 8, 0, 0, + 0, 32, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 3, 0, + 0, 84, 69, 88, 67, 79, 79, 82, + 68, 0, 171, 171, 171, 79, 83, 71, + 78, 116, 0, 0, 0, 4, 0, 0, + 0, 8, 0, 0, 0, 104, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 15, 0, 0, 0, 104, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 15, 0, 0, 0, 104, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 2, 0, 0, + 0, 15, 0, 0, 0, 104, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 15, 0, 0, 0, 83, 86, 95, + 84, 97, 114, 103, 101, 116, 0, 171, +171, 68, 88, 66, 67, 110, 14, 140, +120, 239, 110, 56, 78, 103, 37, 245, +162, 140, 151, 93, 223, 1, 0, 0, + 0, 144, 4, 0, 0, 6, 0, 0, + 0, 56, 0, 0, 0, 68, 1, 0, + 0, 156, 2, 0, 0, 24, 3, 0, + 0, 236, 3, 0, 0, 56, 4, 0, + 0, 65, 111, 110, 57, 4, 1, 0, + 0, 4, 1, 0, 0, 0, 2, 254, +255, 208, 0, 0, 0, 52, 0, 0, + 0, 1, 0, 36, 0, 0, 0, 48, + 0, 0, 0, 48, 0, 0, 0, 36, + 0, 1, 0, 48, 0, 0, 0, 0, + 0, 4, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 254, +255, 81, 0, 0, 5, 5, 0, 15, +160, 0, 0, 0, 63, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 31, 0, 0, 2, 5, 0, 0, +128, 0, 0, 15, 144, 31, 0, 0, + 2, 5, 0, 1, 128, 1, 0, 15, +144, 9, 0, 0, 3, 0, 0, 1, +128, 3, 0, 228, 160, 0, 0, 228, +144, 9, 0, 0, 3, 0, 0, 2, +128, 4, 0, 228, 160, 0, 0, 228, +144, 2, 0, 0, 3, 0, 0, 1, +128, 0, 0, 85, 128, 0, 0, 0, +128, 5, 0, 0, 3, 0, 0, 4, +192, 0, 0, 0, 128, 5, 0, 0, +160, 9, 0, 0, 3, 0, 0, 1, +128, 2, 0, 228, 160, 0, 0, 228, +144, 1, 0, 0, 2, 1, 0, 2, +128, 0, 0, 0, 129, 9, 0, 0, + 3, 1, 0, 1, 128, 1, 0, 228, +160, 0, 0, 228, 144, 4, 0, 0, + 4, 0, 0, 3, 192, 0, 0, 85, +128, 0, 0, 228, 160, 1, 0, 228, +128, 1, 0, 0, 2, 0, 0, 8, +192, 0, 0, 85, 128, 1, 0, 0, + 2, 0, 0, 3, 224, 1, 0, 228, +144, 255, 255, 0, 0, 83, 72, 68, + 82, 80, 1, 0, 0, 64, 0, 1, + 0, 84, 0, 0, 0, 89, 0, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 95, 0, 0, + 3, 242, 16, 16, 0, 0, 0, 0, + 0, 95, 0, 0, 3, 50, 16, 16, + 0, 1, 0, 0, 0, 101, 0, 0, + 3, 50, 32, 16, 0, 0, 0, 0, + 0, 103, 0, 0, 4, 242, 32, 16, + 0, 1, 0, 0, 0, 1, 0, 0, + 0, 104, 0, 0, 2, 1, 0, 0, + 0, 54, 0, 0, 5, 50, 32, 16, + 0, 0, 0, 0, 0, 70, 16, 16, + 0, 1, 0, 0, 0, 17, 0, 0, + 8, 18, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 70, 30, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 6, 34, 32, 16, 0, 1, 0, 0, + 0, 10, 0, 16, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 17, 0, 0, + 8, 18, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 70, 30, 16, + 0, 0, 0, 0, 0, 17, 0, 0, + 8, 34, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 70, 30, 16, + 0, 0, 0, 0, 0, 0, 0, 0, + 7, 18, 0, 16, 0, 0, 0, 0, + 0, 26, 0, 16, 0, 0, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 130, 32, 16, + 0, 1, 0, 0, 0, 26, 0, 16, + 0, 0, 0, 0, 0, 56, 0, 0, + 7, 66, 32, 16, 0, 1, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 63, 17, 0, 0, 8, 18, 32, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 30, 16, 0, 0, 0, 0, + 0, 62, 0, 0, 1, 83, 84, 65, + 84, 116, 0, 0, 0, 10, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 82, 68, 69, 70, 204, 0, 0, + 0, 1, 0, 0, 0, 72, 0, 0, + 0, 1, 0, 0, 0, 28, 0, 0, + 0, 0, 4, 254, 255, 0, 65, 0, + 0, 152, 0, 0, 0, 60, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 36, 71, 108, +111, 98, 97, 108, 115, 0, 171, 171, +171, 60, 0, 0, 0, 1, 0, 0, + 0, 96, 0, 0, 0, 64, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 120, 0, 0, 0, 0, 0, 0, + 0, 64, 0, 0, 0, 2, 0, 0, + 0, 136, 0, 0, 0, 0, 0, 0, + 0, 95, 67, 67, 95, 77, 86, 80, + 77, 97, 116, 114, 105, 120, 0, 171, +171, 3, 0, 3, 0, 4, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 77, 105, 99, 114, 111, 115, 111, +102, 116, 32, 40, 82, 41, 32, 72, + 76, 83, 76, 32, 83, 104, 97, 100, +101, 114, 32, 67, 111, 109, 112, 105, +108, 101, 114, 32, 54, 46, 51, 46, + 57, 54, 48, 48, 46, 49, 54, 51, + 56, 52, 0, 171, 171, 73, 83, 71, + 78, 68, 0, 0, 0, 2, 0, 0, + 0, 8, 0, 0, 0, 56, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 15, 15, 0, 0, 56, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 3, 3, 0, 0, 84, 69, 88, + 67, 79, 79, 82, 68, 0, 171, 171, +171, 79, 83, 71, 78, 80, 0, 0, + 0, 2, 0, 0, 0, 8, 0, 0, + 0, 56, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 12, 0, + 0, 65, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 3, 0, 0, + 0, 1, 0, 0, 0, 15, 0, 0, + 0, 84, 69, 88, 67, 79, 79, 82, + 68, 0, 83, 86, 95, 80, 111, 115, +105, 116, 105, 111, 110, 0, 171, 171, +171, +}; + +const unsigned char s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86[] = { 166, 147, 0, 0, 142, 9, 2, 1, 0, 128, 0, 0, 82, 139, 0, 0, @@ -4109,7 +4068,7 @@ const unsigned char s_DEB4FBAF8139EA1475C188A08B5C6AD1C473A768[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, - 2, 0, 0, 0, 92, 139, 0, 0, + 3, 0, 0, 0, 92, 139, 0, 0, 242, 141, 0, 0, 12, 0, 0, 0, 67, 67, 95, 77, 86, 80, 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, @@ -4119,685 +4078,375 @@ const unsigned char s_DEB4FBAF8139EA1475C188A08B5C6AD1C473A768[] = { 67, 67, 95, 84, 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 2, 0, 0, 0, 12, - 0, 0, 0, 67, 67, 95, 77, 86, - 80, 77, 97, 116, 114, 105, 120, 0, - 0, 0, 0, 0, 0, 0, 0, 11, - 0, 0, 0, 67, 67, 95, 84, 101, -120, 116, 117, 114, 101, 48, 0, 0, - 0, 0, 1, 0, 0, 0, 24, 4, - 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 136, 0, 0, 0, 0, + 0, 0, 0, 82, 139, 0, 0, 240, +141, 0, 0, 11, 0, 0, 0, 117, + 95, 116, 101, 120, 116, 67, 111, 108, +111, 114, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, 1, 0, + 0, 0, 3, 0, 0, 0, 12, 0, + 0, 0, 67, 67, 95, 77, 86, 80, + 77, 97, 116, 114, 105, 120, 0, 0, + 0, 0, 0, 0, 0, 0, 11, 0, + 0, 0, 67, 67, 95, 84, 101, 120, +116, 117, 114, 101, 48, 0, 0, 0, + 0, 1, 0, 0, 0, 11, 0, 0, + 0, 117, 95, 116, 101, 120, 116, 67, +111, 108, 111, 114, 0, 0, 0, 0, + 2, 0, 0, 0, 240, 5, 0, 0, + 4, 5, 0, 0, 0, 0, 0, 0, + 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 88, 66, 67, 200, 5, -103, 205, 248, 30, 69, 65, 32, 117, - 98, 148, 123, 240, 193, 101, 1, 0, - 0, 0, 24, 4, 0, 0, 6, 0, - 0, 0, 56, 0, 0, 0, 240, 0, - 0, 0, 20, 2, 0, 0, 144, 2, - 0, 0, 80, 3, 0, 0, 156, 3, - 0, 0, 65, 111, 110, 57, 176, 0, - 0, 0, 176, 0, 0, 0, 0, 2, -255, 255, 136, 0, 0, 0, 40, 0, - 0, 0, 0, 0, 40, 0, 0, 0, - 40, 0, 0, 0, 40, 0, 1, 0, - 36, 0, 0, 0, 40, 0, 0, 0, - 0, 0, 1, 2, 255, 255, 31, 0, - 0, 2, 0, 0, 0, 128, 0, 0, - 15, 176, 31, 0, 0, 2, 0, 0, - 0, 128, 1, 0, 3, 176, 31, 0, - 0, 2, 0, 0, 0, 144, 0, 8, - 15, 160, 66, 0, 0, 3, 0, 0, - 15, 128, 1, 0, 228, 176, 0, 8, -228, 160, 5, 0, 0, 3, 0, 0, - 8, 128, 0, 0, 255, 128, 0, 0, -255, 176, 1, 0, 0, 2, 0, 0, - 7, 128, 0, 0, 228, 176, 1, 0, - 0, 2, 0, 8, 15, 128, 0, 0, -228, 128, 1, 0, 0, 2, 1, 8, - 15, 128, 0, 0, 228, 128, 1, 0, - 0, 2, 2, 8, 15, 128, 0, 0, -228, 128, 1, 0, 0, 2, 3, 8, - 15, 128, 0, 0, 228, 128, 255, 255, - 0, 0, 83, 72, 68, 82, 28, 1, - 0, 0, 64, 0, 0, 0, 71, 0, - 0, 0, 90, 0, 0, 3, 0, 96, - 16, 0, 0, 0, 0, 0, 88, 24, - 0, 4, 0, 112, 16, 0, 0, 0, - 0, 0, 85, 85, 0, 0, 98, 16, - 0, 3, 242, 16, 16, 0, 0, 0, - 0, 0, 98, 16, 0, 3, 50, 16, - 16, 0, 1, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 0, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 1, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 2, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 3, 0, 0, 0, 104, 0, - 0, 2, 1, 0, 0, 0, 69, 0, - 0, 9, 242, 0, 16, 0, 0, 0, - 0, 0, 70, 16, 16, 0, 1, 0, - 0, 0, 70, 126, 16, 0, 0, 0, - 0, 0, 0, 96, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 7, 130, 0, - 16, 0, 0, 0, 0, 0, 58, 0, - 16, 0, 0, 0, 0, 0, 58, 16, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 114, 0, 16, 0, 0, 0, - 0, 0, 70, 18, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 0, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 1, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 2, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 3, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 62, 0, 0, 1, 83, 84, - 65, 84, 116, 0, 0, 0, 8, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 6, 0, 0, 0, 1, 0, + 68, 88, 66, 67, 223, 173, 203, 80, +172, 13, 170, 215, 168, 128, 228, 5, + 62, 250, 21, 248, 1, 0, 0, 0, +240, 5, 0, 0, 6, 0, 0, 0, + 56, 0, 0, 0, 124, 1, 0, 0, +112, 3, 0, 0, 236, 3, 0, 0, + 40, 5, 0, 0, 116, 5, 0, 0, + 65, 111, 110, 57, 60, 1, 0, 0, + 60, 1, 0, 0, 0, 2, 255, 255, + 8, 1, 0, 0, 52, 0, 0, 0, + 1, 0, 40, 0, 0, 0, 52, 0, + 0, 0, 52, 0, 1, 0, 36, 0, + 0, 0, 52, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 2, 255, 255, + 81, 0, 0, 5, 1, 0, 15, 160, + 31, 133, 235, 190, 254, 255, 71, 65, + 0, 0, 0, 192, 0, 0, 64, 64, + 31, 0, 0, 2, 0, 0, 0, 128, + 0, 0, 15, 176, 31, 0, 0, 2, + 0, 0, 0, 128, 1, 0, 3, 176, + 31, 0, 0, 2, 0, 0, 0, 144, + 0, 8, 15, 160, 66, 0, 0, 3, + 0, 0, 15, 128, 1, 0, 228, 176, + 0, 8, 228, 160, 2, 0, 0, 3, + 0, 0, 1, 128, 0, 0, 255, 128, + 1, 0, 0, 160, 5, 0, 0, 3, + 0, 0, 17, 128, 0, 0, 0, 128, + 1, 0, 85, 160, 4, 0, 0, 4, + 0, 0, 2, 128, 0, 0, 0, 128, + 1, 0, 170, 160, 1, 0, 255, 160, + 5, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 0, 128, 0, 0, 0, 128, + 5, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 0, 128, 0, 0, 85, 128, + 5, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 0, 128, 0, 0, 255, 160, + 5, 0, 0, 3, 0, 0, 8, 128, + 0, 0, 0, 128, 0, 0, 255, 176, + 5, 0, 0, 3, 0, 0, 7, 128, + 0, 0, 228, 176, 0, 0, 228, 160, + 1, 0, 0, 2, 0, 8, 15, 128, + 0, 0, 228, 128, 1, 0, 0, 2, + 1, 8, 15, 128, 0, 0, 228, 128, + 1, 0, 0, 2, 2, 8, 15, 128, + 0, 0, 228, 128, 1, 0, 0, 2, + 3, 8, 15, 128, 0, 0, 228, 128, +255, 255, 0, 0, 83, 72, 68, 82, +236, 1, 0, 0, 64, 0, 0, 0, +123, 0, 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, 16, 0, + 0, 0, 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 242, 16, 16, 0, + 0, 0, 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 101, 0, 0, 3, +242, 32, 16, 0, 1, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 2, 0, 0, 0, 101, 0, 0, 3, +242, 32, 16, 0, 3, 0, 0, 0, +104, 0, 0, 2, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 0, 0, 0, 7, + 18, 0, 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 31, 133, 235, 190, + 56, 32, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 1, 64, 0, 0, +254, 255, 71, 65, 50, 0, 0, 9, + 34, 0, 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, 0, 192, + 1, 64, 0, 0, 0, 0, 64, 64, + 56, 0, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 56, 0, 0, 7, + 18, 0, 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, 0, 0, + 26, 0, 16, 0, 0, 0, 0, 0, + 56, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 58, 128, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 130, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 58, 16, 16, 0, + 0, 0, 0, 0, 56, 0, 0, 8, +114, 0, 16, 0, 0, 0, 0, 0, + 70, 18, 16, 0, 0, 0, 0, 0, + 70, 130, 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +242, 32, 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 1, 0, 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +242, 32, 16, 0, 2, 0, 0, 0, + 70, 14, 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 3, 0, 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, 0, 0, + 14, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, + 8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 68, 69, 70, 184, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 28, 0, - 0, 0, 0, 4, 255, 255, 0, 65, - 0, 0, 134, 0, 0, 0, 92, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 1, 0, 0, 0, 113, 0, - 0, 0, 2, 0, 0, 0, 5, 0, - 0, 0, 4, 0, 0, 0, 255, 255, -255, 255, 0, 0, 0, 0, 1, 0, - 0, 0, 13, 0, 0, 0, 115, 97, -109, 112, 108, 101, 114, 95, 95, 67, - 67, 95, 84, 101, 120, 116, 117, 114, -101, 48, 0, 116, 101, 120, 116, 117, -114, 101, 95, 95, 67, 67, 95, 84, -101, 120, 116, 117, 114, 101, 48, 0, - 77, 105, 99, 114, 111, 115, 111, 102, -116, 32, 40, 82, 41, 32, 72, 76, - 83, 76, 32, 83, 104, 97, 100, 101, -114, 32, 67, 111, 109, 112, 105, 108, -101, 114, 32, 54, 46, 51, 46, 57, - 54, 48, 48, 46, 49, 54, 51, 56, - 52, 0, 73, 83, 71, 78, 68, 0, - 0, 0, 2, 0, 0, 0, 8, 0, - 0, 0, 56, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 15, 15, - 0, 0, 56, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, 3, 3, - 0, 0, 84, 69, 88, 67, 79, 79, - 82, 68, 0, 171, 171, 171, 79, 83, - 71, 78, 116, 0, 0, 0, 4, 0, - 0, 0, 8, 0, 0, 0, 104, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 1, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 2, 0, - 0, 0, 15, 0, 0, 0, 104, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 3, 0, - 0, 0, 15, 0, 0, 0, 83, 86, - 95, 84, 97, 114, 103, 101, 116, 0, -171, 171, 68, 88, 66, 67, 235, 56, -180, 223, 125, 231, 231, 218, 70, 75, - 12, 63, 200, 233, 69, 121, 1, 0, - 0, 0, 4, 5, 0, 0, 6, 0, - 0, 0, 56, 0, 0, 0, 92, 1, - 0, 0, 224, 2, 0, 0, 92, 3, - 0, 0, 48, 4, 0, 0, 148, 4, - 0, 0, 65, 111, 110, 57, 28, 1, - 0, 0, 28, 1, 0, 0, 0, 2, -254, 255, 232, 0, 0, 0, 52, 0, - 0, 0, 1, 0, 36, 0, 0, 0, - 48, 0, 0, 0, 48, 0, 0, 0, - 36, 0, 1, 0, 48, 0, 0, 0, - 0, 0, 4, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 2, -254, 255, 81, 0, 0, 5, 5, 0, - 15, 160, 0, 0, 0, 63, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 31, 0, 0, 2, 5, 0, - 0, 128, 0, 0, 15, 144, 31, 0, - 0, 2, 5, 0, 1, 128, 1, 0, - 15, 144, 31, 0, 0, 2, 5, 0, - 2, 128, 2, 0, 15, 144, 9, 0, - 0, 3, 0, 0, 1, 128, 3, 0, -228, 160, 1, 0, 228, 144, 9, 0, - 0, 3, 0, 0, 2, 128, 4, 0, -228, 160, 1, 0, 228, 144, 2, 0, - 0, 3, 0, 0, 1, 128, 0, 0, - 85, 128, 0, 0, 0, 128, 5, 0, - 0, 3, 0, 0, 4, 192, 0, 0, - 0, 128, 5, 0, 0, 160, 9, 0, - 0, 3, 0, 0, 1, 128, 2, 0, -228, 160, 1, 0, 228, 144, 1, 0, - 0, 2, 1, 0, 2, 128, 0, 0, - 0, 129, 9, 0, 0, 3, 1, 0, - 1, 128, 1, 0, 228, 160, 1, 0, -228, 144, 4, 0, 0, 4, 0, 0, - 3, 192, 0, 0, 85, 128, 0, 0, -228, 160, 1, 0, 228, 128, 1, 0, - 0, 2, 0, 0, 8, 192, 0, 0, - 85, 128, 1, 0, 0, 2, 0, 0, - 15, 224, 0, 0, 228, 144, 1, 0, - 0, 2, 1, 0, 3, 224, 2, 0, -228, 144, 255, 255, 0, 0, 83, 72, - 68, 82, 124, 1, 0, 0, 64, 0, - 1, 0, 95, 0, 0, 0, 89, 0, - 0, 4, 70, 142, 32, 0, 0, 0, - 0, 0, 4, 0, 0, 0, 95, 0, - 0, 3, 242, 16, 16, 0, 0, 0, - 0, 0, 95, 0, 0, 3, 242, 16, - 16, 0, 1, 0, 0, 0, 95, 0, - 0, 3, 50, 16, 16, 0, 2, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 0, 0, 0, 0, 101, 0, - 0, 3, 50, 32, 16, 0, 1, 0, - 0, 0, 103, 0, 0, 4, 242, 32, - 16, 0, 2, 0, 0, 0, 1, 0, - 0, 0, 104, 0, 0, 2, 1, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 0, 0, 0, 0, 70, 30, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 50, 32, 16, 0, 1, 0, - 0, 0, 70, 16, 16, 0, 2, 0, - 0, 0, 17, 0, 0, 8, 18, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 54, 0, 0, 6, 34, 32, - 16, 0, 2, 0, 0, 0, 10, 0, - 16, 128, 65, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 8, 18, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 17, 0, 0, 8, 34, 0, - 16, 0, 0, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 0, 0, 0, 7, 18, 0, - 16, 0, 0, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 130, 32, 16, 0, 2, 0, - 0, 0, 26, 0, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 7, 66, 32, - 16, 0, 2, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, 1, 64, - 0, 0, 0, 0, 0, 63, 17, 0, - 0, 8, 18, 32, 16, 0, 2, 0, - 0, 0, 70, 142, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 70, 30, - 16, 0, 1, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, 116, 0, - 0, 0, 11, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 6, 0, - 0, 0, 7, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 82, 68, 69, 70, + 52, 1, 0, 0, 1, 0, 0, 0, +176, 0, 0, 0, 3, 0, 0, 0, + 28, 0, 0, 0, 0, 4, 255, 255, + 0, 65, 0, 0, 0, 1, 0, 0, +124, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 1, 0, 0, 0, +145, 0, 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 4, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 1, 0, 0, 0, 13, 0, 0, 0, +166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 82, 68, - 69, 70, 204, 0, 0, 0, 1, 0, - 0, 0, 72, 0, 0, 0, 1, 0, - 0, 0, 28, 0, 0, 0, 0, 4, -254, 255, 0, 65, 0, 0, 152, 0, - 0, 0, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 36, 71, 108, 111, 98, 97, -108, 115, 0, 171, 171, 171, 60, 0, - 0, 0, 1, 0, 0, 0, 96, 0, - 0, 0, 64, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 120, 0, - 0, 0, 0, 0, 0, 0, 64, 0, - 0, 0, 2, 0, 0, 0, 136, 0, - 0, 0, 0, 0, 0, 0, 95, 67, - 67, 95, 77, 86, 80, 77, 97, 116, -114, 105, 120, 0, 171, 171, 3, 0, - 3, 0, 4, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 77, 105, - 99, 114, 111, 115, 111, 102, 116, 32, - 40, 82, 41, 32, 72, 76, 83, 76, - 32, 83, 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, 101, 114, - 32, 54, 46, 51, 46, 57, 54, 48, - 48, 46, 49, 54, 51, 56, 52, 0, -171, 171, 73, 83, 71, 78, 92, 0, - 0, 0, 3, 0, 0, 0, 8, 0, - 0, 0, 80, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 15, 15, - 0, 0, 80, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, 15, 15, - 0, 0, 80, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, 3, 3, - 0, 0, 84, 69, 88, 67, 79, 79, - 82, 68, 0, 171, 171, 171, 79, 83, - 71, 78, 104, 0, 0, 0, 3, 0, - 0, 0, 8, 0, 0, 0, 80, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, 80, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 1, 0, - 0, 0, 3, 12, 0, 0, 89, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 3, 0, 0, 0, 2, 0, - 0, 0, 15, 0, 0, 0, 84, 69, - 88, 67, 79, 79, 82, 68, 0, 83, - 86, 95, 80, 111, 115, 105, 116, 105, -111, 110, 0, 171, 171, 171, -}; - -const unsigned char s_E08D0EA3D0C617D5C94A0AD06B8387F8842C94E9[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 1, 0, - 0, 0, 82, 139, 0, 0, 7, 0, - 0, 0, 97, 95, 99, 111, 108, 111, -114, 0, 0, 0, 0, 80, 139, 0, - 0, 10, 0, 0, 0, 97, 95, 116, -101, 120, 67, 111, 111, 114, 100, 2, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 2, 0, 0, 0, 92, 139, 0, 0, -242, 141, 0, 0, 10, 0, 0, 0, - 67, 67, 95, 80, 77, 97, 116, 114, -105, 120, 0, 0, 0, 0, 255, 255, -255, 255, 0, 0, 0, 0, 4, 0, - 0, 0, 94, 139, 0, 0, 0, 0, - 0, 0, 11, 0, 0, 0, 67, 67, + 1, 0, 0, 0, 0, 0, 0, 0, +115, 97, 109, 112, 108, 101, 114, 95, + 95, 67, 67, 95, 84, 101, 120, 116, +117, 114, 101, 48, 0, 116, 101, 120, +116, 117, 114, 101, 95, 95, 67, 67, 95, 84, 101, 120, 116, 117, 114, 101, - 48, 0, 0, 0, 0, 0, 0, 0, - 0, 255, 255, 255, 255, 1, 0, 0, - 0, 2, 0, 0, 0, 10, 0, 0, - 0, 67, 67, 95, 80, 77, 97, 116, -114, 105, 120, 0, 0, 0, 0, 0, - 0, 0, 0, 11, 0, 0, 0, 67, - 67, 95, 84, 101, 120, 116, 117, 114, -101, 48, 0, 0, 0, 0, 1, 0, - 0, 0, 248, 3, 0, 0, 0, 5, - 0, 0, 0, 0, 0, 0, 212, 136, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 68, 88, - 66, 67, 11, 95, 74, 206, 145, 124, - 32, 219, 67, 19, 26, 23, 189, 75, - 35, 86, 1, 0, 0, 0, 248, 3, - 0, 0, 6, 0, 0, 0, 56, 0, - 0, 0, 228, 0, 0, 0, 244, 1, - 0, 0, 112, 2, 0, 0, 48, 3, - 0, 0, 124, 3, 0, 0, 65, 111, -110, 57, 164, 0, 0, 0, 164, 0, - 0, 0, 0, 2, 255, 255, 124, 0, - 0, 0, 40, 0, 0, 0, 0, 0, - 40, 0, 0, 0, 40, 0, 0, 0, - 40, 0, 1, 0, 36, 0, 0, 0, - 40, 0, 0, 0, 0, 0, 1, 2, -255, 255, 31, 0, 0, 2, 0, 0, - 0, 128, 0, 0, 15, 176, 31, 0, - 0, 2, 0, 0, 0, 128, 1, 0, - 3, 176, 31, 0, 0, 2, 0, 0, - 0, 144, 0, 8, 15, 160, 66, 0, - 0, 3, 0, 0, 15, 128, 1, 0, -228, 176, 0, 8, 228, 160, 5, 0, - 0, 3, 0, 0, 15, 128, 0, 0, -228, 128, 0, 0, 228, 176, 1, 0, - 0, 2, 0, 8, 15, 128, 0, 0, -228, 128, 1, 0, 0, 2, 1, 8, - 15, 128, 0, 0, 228, 128, 1, 0, - 0, 2, 2, 8, 15, 128, 0, 0, -228, 128, 1, 0, 0, 2, 3, 8, - 15, 128, 0, 0, 228, 128, 255, 255, - 0, 0, 83, 72, 68, 82, 8, 1, - 0, 0, 64, 0, 0, 0, 66, 0, - 0, 0, 90, 0, 0, 3, 0, 96, - 16, 0, 0, 0, 0, 0, 88, 24, - 0, 4, 0, 112, 16, 0, 0, 0, - 0, 0, 85, 85, 0, 0, 98, 16, - 0, 3, 242, 16, 16, 0, 0, 0, - 0, 0, 98, 16, 0, 3, 50, 16, - 16, 0, 1, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 0, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 1, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 2, 0, - 0, 0, 101, 0, 0, 3, 242, 32, - 16, 0, 3, 0, 0, 0, 104, 0, - 0, 2, 1, 0, 0, 0, 69, 0, - 0, 9, 242, 0, 16, 0, 0, 0, - 0, 0, 70, 16, 16, 0, 1, 0, - 0, 0, 70, 126, 16, 0, 0, 0, - 0, 0, 0, 96, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 7, 242, 0, - 16, 0, 0, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 70, 30, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 0, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 1, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 2, 0, - 0, 0, 70, 14, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 242, 32, - 16, 0, 3, 0, 0, 0, 70, 14, - 16, 0, 0, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, 116, 0, - 0, 0, 7, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 6, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 4, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 82, 68, - 69, 70, 184, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 2, 0, - 0, 0, 28, 0, 0, 0, 0, 4, -255, 255, 0, 65, 0, 0, 134, 0, - 0, 0, 92, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 1, 0, - 0, 0, 113, 0, 0, 0, 2, 0, - 0, 0, 5, 0, 0, 0, 4, 0, - 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 1, 0, 0, 0, 13, 0, - 0, 0, 115, 97, 109, 112, 108, 101, -114, 95, 95, 67, 67, 95, 84, 101, -120, 116, 117, 114, 101, 48, 0, 116, -101, 120, 116, 117, 114, 101, 95, 95, - 67, 67, 95, 84, 101, 120, 116, 117, -114, 101, 48, 0, 77, 105, 99, 114, + 48, 0, 36, 71, 108, 111, 98, 97, +108, 115, 0, 171, 166, 0, 0, 0, + 1, 0, 0, 0, 200, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 224, 0, 0, 0, + 0, 0, 0, 0, 16, 0, 0, 0, + 2, 0, 0, 0, 240, 0, 0, 0, + 0, 0, 0, 0, 95, 117, 95, 116, +101, 120, 116, 67, 111, 108, 111, 114, + 0, 171, 171, 171, 1, 0, 3, 0, + 1, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 77, 105, 99, 114, 111, 115, 111, 102, 116, 32, 40, 82, 41, 32, 72, 76, 83, 76, 32, 83, 104, 97, 100, 101, 114, 32, 67, 111, 109, 112, 105, 108, 101, 114, 32, 54, 46, 51, 46, 57, 54, 48, 48, 46, - 49, 54, 51, 56, 52, 0, 73, 83, - 71, 78, 68, 0, 0, 0, 2, 0, - 0, 0, 8, 0, 0, 0, 56, 0, + 49, 54, 51, 56, 52, 0, 171, 171, + 73, 83, 71, 78, 68, 0, 0, 0, + 2, 0, 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 15, 0, 0, + 56, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 3, 0, 0, + 84, 69, 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, 71, 78, +116, 0, 0, 0, 4, 0, 0, 0, + 8, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 15, 15, 0, 0, 56, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 1, 0, - 0, 0, 3, 3, 0, 0, 84, 69, - 88, 67, 79, 79, 82, 68, 0, 171, -171, 171, 79, 83, 71, 78, 116, 0, - 0, 0, 4, 0, 0, 0, 8, 0, - 0, 0, 104, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 15, 0, - 0, 0, 104, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, 15, 0, - 0, 0, 104, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, 15, 0, - 0, 0, 104, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 3, 0, 0, 0, 15, 0, - 0, 0, 83, 86, 95, 84, 97, 114, -103, 101, 116, 0, 171, 171, 68, 88, - 66, 67, 53, 89, 218, 251, 179, 193, -226, 187, 197, 89, 218, 37, 36, 176, -206, 80, 1, 0, 0, 0, 0, 5, - 0, 0, 6, 0, 0, 0, 56, 0, - 0, 0, 92, 1, 0, 0, 224, 2, - 0, 0, 92, 3, 0, 0, 44, 4, - 0, 0, 144, 4, 0, 0, 65, 111, -110, 57, 28, 1, 0, 0, 28, 1, - 0, 0, 0, 2, 254, 255, 232, 0, - 0, 0, 52, 0, 0, 0, 1, 0, - 36, 0, 0, 0, 48, 0, 0, 0, - 48, 0, 0, 0, 36, 0, 1, 0, - 48, 0, 0, 0, 0, 0, 4, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 104, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 2, 254, 255, 81, 0, - 0, 5, 5, 0, 15, 160, 0, 0, - 0, 63, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 31, 0, - 0, 2, 5, 0, 0, 128, 0, 0, - 15, 144, 31, 0, 0, 2, 5, 0, - 1, 128, 1, 0, 15, 144, 31, 0, - 0, 2, 5, 0, 2, 128, 2, 0, - 15, 144, 9, 0, 0, 3, 0, 0, - 1, 128, 3, 0, 228, 160, 1, 0, -228, 144, 9, 0, 0, 3, 0, 0, - 2, 128, 4, 0, 228, 160, 1, 0, -228, 144, 2, 0, 0, 3, 0, 0, - 1, 128, 0, 0, 85, 128, 0, 0, - 0, 128, 5, 0, 0, 3, 0, 0, - 4, 192, 0, 0, 0, 128, 5, 0, - 0, 160, 9, 0, 0, 3, 0, 0, - 1, 128, 2, 0, 228, 160, 1, 0, -228, 144, 1, 0, 0, 2, 1, 0, - 2, 128, 0, 0, 0, 129, 9, 0, - 0, 3, 1, 0, 1, 128, 1, 0, -228, 160, 1, 0, 228, 144, 4, 0, - 0, 4, 0, 0, 3, 192, 0, 0, - 85, 128, 0, 0, 228, 160, 1, 0, -228, 128, 1, 0, 0, 2, 0, 0, - 8, 192, 0, 0, 85, 128, 1, 0, - 0, 2, 0, 0, 15, 224, 0, 0, -228, 144, 1, 0, 0, 2, 1, 0, - 3, 224, 2, 0, 228, 144, 255, 255, - 0, 0, 83, 72, 68, 82, 124, 1, - 0, 0, 64, 0, 1, 0, 95, 0, - 0, 0, 89, 0, 0, 4, 70, 142, - 32, 0, 0, 0, 0, 0, 4, 0, - 0, 0, 95, 0, 0, 3, 242, 16, - 16, 0, 0, 0, 0, 0, 95, 0, - 0, 3, 242, 16, 16, 0, 1, 0, - 0, 0, 95, 0, 0, 3, 50, 16, - 16, 0, 2, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, 0, 0, - 0, 0, 101, 0, 0, 3, 50, 32, - 16, 0, 1, 0, 0, 0, 103, 0, - 0, 4, 242, 32, 16, 0, 2, 0, - 0, 0, 1, 0, 0, 0, 104, 0, - 0, 2, 1, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, 0, 0, - 0, 0, 70, 30, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 50, 32, - 16, 0, 1, 0, 0, 0, 70, 16, - 16, 0, 2, 0, 0, 0, 17, 0, - 0, 8, 18, 0, 16, 0, 0, 0, - 0, 0, 70, 142, 32, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 70, 30, - 16, 0, 1, 0, 0, 0, 54, 0, - 0, 6, 34, 32, 16, 0, 2, 0, - 0, 0, 10, 0, 16, 128, 65, 0, - 0, 0, 0, 0, 0, 0, 17, 0, - 0, 8, 18, 0, 16, 0, 0, 0, - 0, 0, 70, 142, 32, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 70, 30, - 16, 0, 1, 0, 0, 0, 17, 0, - 0, 8, 34, 0, 16, 0, 0, 0, - 0, 0, 70, 142, 32, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 70, 30, - 16, 0, 1, 0, 0, 0, 0, 0, - 0, 7, 18, 0, 16, 0, 0, 0, - 0, 0, 26, 0, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, 130, 32, - 16, 0, 2, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, 56, 0, - 0, 7, 66, 32, 16, 0, 2, 0, - 0, 0, 10, 0, 16, 0, 0, 0, - 0, 0, 1, 64, 0, 0, 0, 0, - 0, 63, 17, 0, 0, 8, 18, 32, - 16, 0, 2, 0, 0, 0, 70, 142, - 32, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 70, 30, 16, 0, 1, 0, - 0, 0, 62, 0, 0, 1, 83, 84, - 65, 84, 116, 0, 0, 0, 11, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 6, 0, 0, 0, 7, 0, + 3, 0, 0, 0, 1, 0, 0, 0, + 15, 0, 0, 0, 104, 0, 0, 0, + 2, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 2, 0, 0, 0, + 15, 0, 0, 0, 104, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 3, 0, 0, 0, + 15, 0, 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, 171, 171, + 68, 88, 66, 67, 235, 56, 180, 223, +125, 231, 231, 218, 70, 75, 12, 63, +200, 233, 69, 121, 1, 0, 0, 0, + 4, 5, 0, 0, 6, 0, 0, 0, + 56, 0, 0, 0, 92, 1, 0, 0, +224, 2, 0, 0, 92, 3, 0, 0, + 48, 4, 0, 0, 148, 4, 0, 0, + 65, 111, 110, 57, 28, 1, 0, 0, + 28, 1, 0, 0, 0, 2, 254, 255, +232, 0, 0, 0, 52, 0, 0, 0, + 1, 0, 36, 0, 0, 0, 48, 0, + 0, 0, 48, 0, 0, 0, 36, 0, + 1, 0, 48, 0, 0, 0, 0, 0, + 4, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 2, 254, 255, + 81, 0, 0, 5, 5, 0, 15, 160, + 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, + 31, 0, 0, 2, 5, 0, 0, 128, + 0, 0, 15, 144, 31, 0, 0, 2, + 5, 0, 1, 128, 1, 0, 15, 144, + 31, 0, 0, 2, 5, 0, 2, 128, + 2, 0, 15, 144, 9, 0, 0, 3, + 0, 0, 1, 128, 3, 0, 228, 160, + 1, 0, 228, 144, 9, 0, 0, 3, + 0, 0, 2, 128, 4, 0, 228, 160, + 1, 0, 228, 144, 2, 0, 0, 3, + 0, 0, 1, 128, 0, 0, 85, 128, + 0, 0, 0, 128, 5, 0, 0, 3, + 0, 0, 4, 192, 0, 0, 0, 128, + 5, 0, 0, 160, 9, 0, 0, 3, + 0, 0, 1, 128, 2, 0, 228, 160, + 1, 0, 228, 144, 1, 0, 0, 2, + 1, 0, 2, 128, 0, 0, 0, 129, + 9, 0, 0, 3, 1, 0, 1, 128, + 1, 0, 228, 160, 1, 0, 228, 144, + 4, 0, 0, 4, 0, 0, 3, 192, + 0, 0, 85, 128, 0, 0, 228, 160, + 1, 0, 228, 128, 1, 0, 0, 2, + 0, 0, 8, 192, 0, 0, 85, 128, + 1, 0, 0, 2, 0, 0, 15, 224, + 0, 0, 228, 144, 1, 0, 0, 2, + 1, 0, 3, 224, 2, 0, 228, 144, +255, 255, 0, 0, 83, 72, 68, 82, +124, 1, 0, 0, 64, 0, 1, 0, + 95, 0, 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 95, 0, 0, 3, +242, 16, 16, 0, 0, 0, 0, 0, + 95, 0, 0, 3, 242, 16, 16, 0, + 1, 0, 0, 0, 95, 0, 0, 3, + 50, 16, 16, 0, 2, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 101, 0, 0, 3, + 50, 32, 16, 0, 1, 0, 0, 0, +103, 0, 0, 4, 242, 32, 16, 0, + 2, 0, 0, 0, 1, 0, 0, 0, +104, 0, 0, 2, 1, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 30, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, + 50, 32, 16, 0, 1, 0, 0, 0, + 70, 16, 16, 0, 2, 0, 0, 0, + 17, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 54, 0, 0, 6, 34, 32, 16, 0, + 2, 0, 0, 0, 10, 0, 16, 128, + 65, 0, 0, 0, 0, 0, 0, 0, + 17, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 2, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 17, 0, 0, 8, 34, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 0, 0, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 26, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +130, 32, 16, 0, 2, 0, 0, 0, + 26, 0, 16, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 66, 32, 16, 0, + 2, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 1, 64, 0, 0, + 0, 0, 0, 63, 17, 0, 0, 8, + 18, 32, 16, 0, 2, 0, 0, 0, + 70, 142, 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 70, 30, 16, 0, + 1, 0, 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, 0, 0, + 11, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 68, 69, 70, 200, 0, - 0, 0, 1, 0, 0, 0, 72, 0, - 0, 0, 1, 0, 0, 0, 28, 0, - 0, 0, 0, 4, 254, 255, 0, 65, - 0, 0, 148, 0, 0, 0, 60, 0, + 0, 0, 0, 0, 82, 68, 69, 70, +204, 0, 0, 0, 1, 0, 0, 0, + 72, 0, 0, 0, 1, 0, 0, 0, + 28, 0, 0, 0, 0, 4, 254, 255, + 0, 65, 0, 0, 152, 0, 0, 0, + 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 36, 71, -108, 111, 98, 97, 108, 115, 0, 171, -171, 171, 60, 0, 0, 0, 1, 0, - 0, 0, 96, 0, 0, 0, 64, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 36, 71, 108, 111, 98, 97, 108, 115, + 0, 171, 171, 171, 60, 0, 0, 0, + 1, 0, 0, 0, 96, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 120, 0, 0, 0, + 0, 0, 0, 0, 64, 0, 0, 0, + 2, 0, 0, 0, 136, 0, 0, 0, + 0, 0, 0, 0, 95, 67, 67, 95, + 77, 86, 80, 77, 97, 116, 114, 105, +120, 0, 171, 171, 3, 0, 3, 0, + 4, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 77, 105, 99, 114, +111, 115, 111, 102, 116, 32, 40, 82, + 41, 32, 72, 76, 83, 76, 32, 83, +104, 97, 100, 101, 114, 32, 67, 111, +109, 112, 105, 108, 101, 114, 32, 54, + 46, 51, 46, 57, 54, 48, 48, 46, + 49, 54, 51, 56, 52, 0, 171, 171, + 73, 83, 71, 78, 92, 0, 0, 0, + 3, 0, 0, 0, 8, 0, 0, 0, + 80, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 15, 0, 0, + 80, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 15, 15, 0, 0, + 80, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 3, 3, 0, 0, + 84, 69, 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, 71, 78, +104, 0, 0, 0, 3, 0, 0, 0, + 8, 0, 0, 0, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 120, 0, 0, 0, 0, 0, - 0, 0, 64, 0, 0, 0, 2, 0, - 0, 0, 132, 0, 0, 0, 0, 0, - 0, 0, 95, 67, 67, 95, 80, 77, - 97, 116, 114, 105, 120, 0, 3, 0, - 3, 0, 4, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 77, 105, - 99, 114, 111, 115, 111, 102, 116, 32, - 40, 82, 41, 32, 72, 76, 83, 76, - 32, 83, 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, 101, 114, - 32, 54, 46, 51, 46, 57, 54, 48, - 48, 46, 49, 54, 51, 56, 52, 0, -171, 171, 73, 83, 71, 78, 92, 0, - 0, 0, 3, 0, 0, 0, 8, 0, - 0, 0, 80, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 15, 15, - 0, 0, 80, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, 15, 15, - 0, 0, 80, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, 3, 3, - 0, 0, 84, 69, 88, 67, 79, 79, - 82, 68, 0, 171, 171, 171, 79, 83, - 71, 78, 104, 0, 0, 0, 3, 0, - 0, 0, 8, 0, 0, 0, 80, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, 80, 0, - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 1, 0, - 0, 0, 3, 12, 0, 0, 89, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 3, 0, 0, 0, 2, 0, - 0, 0, 15, 0, 0, 0, 84, 69, - 88, 67, 79, 79, 82, 68, 0, 83, - 86, 95, 80, 111, 115, 105, 116, 105, -111, 110, 0, 171, 171, 171, + 3, 0, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 80, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, 0, 0, + 3, 12, 0, 0, 89, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 2, 0, 0, 0, + 15, 0, 0, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 83, 86, 95, + 80, 111, 115, 105, 116, 105, 111, 110, + 0, 171, 171, 171, }; const unsigned char s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893[] = { @@ -4877,7 +4526,7 @@ const unsigned char s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893[] = { 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 144, 4, 0, 0, 0, 0, - 0, 0, 212, 136, 0, 0, 0, 0, + 0, 0, 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, @@ -5207,8 +4856,8 @@ const unsigned char s_E2D56227712263272BD5218FEA117CD06180F81B[] = { 117, 95, 112, 111, 105, 110, 116, 83, 105, 122, 101, 0, 0, 0, 0, 2, 0, 0, 0, 204, 2, 0, 0, 208, - 4, 0, 0, 0, 0, 0, 0, 212, -136, 0, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 0, 0, 0, 20, +134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, 125, @@ -5456,7 +5105,7 @@ const unsigned char s_E2D56227712263272BD5218FEA117CD06180F81B[] = { 171, 171, 171, }; -const unsigned char s_EF3272556C5A4049CC885FC4218F09A4A8145ECF[] = { +const unsigned char s_F46558C274182079784898CF4968CF431593D5E2[] = { 166, 147, 0, 0, 142, 9, 2, 1, 0, 128, 0, 0, 82, 139, 0, 0, @@ -5535,13 +5184,13 @@ const unsigned char s_EF3272556C5A4049CC885FC4218F09A4A8145ECF[] = { 114, 101, 48, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 0, 0, 82, 139, 0, 0, 240, -141, 0, 0, 13, 0, 0, 0, 118, +141, 0, 0, 13, 0, 0, 0, 117, 95, 101, 102, 102, 101, 99, 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 1, 0, 0, 0, 82, 139, 0, 0, 240, 141, 0, 0, 11, 0, 0, 0, -118, 95, 116, 101, 120, 116, 67, 111, +117, 95, 116, 101, 120, 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 1, 0, 0, 0, 255, 255, 255, 255, 1, 0, 0, 0, 4, 0, 0, 0, 12, @@ -5551,18 +5200,18 @@ const unsigned char s_EF3272556C5A4049CC885FC4218F09A4A8145ECF[] = { 0, 0, 0, 67, 67, 95, 84, 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 13, 0, - 0, 0, 118, 95, 101, 102, 102, 101, + 0, 0, 117, 95, 101, 102, 102, 101, 99, 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 11, - 0, 0, 0, 118, 95, 116, 101, 120, + 0, 0, 0, 117, 95, 116, 101, 120, 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 108, 6, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 136, 0, 0, 0, 0, + 0, 0, 20, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 68, 88, 66, 67, 148, 187, -136, 149, 211, 207, 96, 241, 101, 58, -159, 209, 130, 46, 238, 6, 1, 0, + 0, 0, 68, 88, 66, 67, 47, 220, +115, 183, 137, 174, 141, 96, 204, 60, +221, 255, 210, 79, 179, 145, 1, 0, 0, 0, 108, 6, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, 176, 1, 0, 0, 200, 3, 0, 0, 68, 4, @@ -5728,11 +5377,11 @@ const unsigned char s_EF3272556C5A4049CC885FC4218F09A4A8145ECF[] = { 0, 0, 0, 0, 0, 0, 24, 1, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 2, 0, 0, 0, 8, 1, - 0, 0, 0, 0, 0, 0, 95, 118, + 0, 0, 0, 0, 0, 0, 95, 117, 95, 101, 102, 102, 101, 99, 116, 67, 111, 108, 111, 114, 0, 171, 1, 0, 3, 0, 1, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 95, 118, + 0, 0, 0, 0, 0, 0, 95, 117, 95, 116, 101, 120, 116, 67, 111, 108, 111, 114, 0, 77, 105, 99, 114, 111, 115, 111, 102, 116, 32, 40, 82, 41, @@ -5929,7 +5578,358 @@ const unsigned char s_EF3272556C5A4049CC885FC4218F09A4A8145ECF[] = { 171, 171, }; +const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, 80, 139, + 0, 0, 10, 0, 0, 0, 97, 95, +116, 101, 120, 67, 111, 111, 114, 100, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 2, 0, 0, 0, 92, 139, 0, + 0, 242, 141, 0, 0, 12, 0, 0, + 0, 67, 67, 95, 77, 86, 80, 77, + 97, 116, 114, 105, 120, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 4, 0, 0, 0, 94, 139, 0, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 67, 67, 95, 84, 101, 120, 116, +117, 114, 101, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 2, 0, 0, 0, + 12, 0, 0, 0, 67, 67, 95, 77, + 86, 80, 77, 97, 116, 114, 105, 120, + 0, 0, 0, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 67, 67, 95, 84, +101, 120, 116, 117, 114, 101, 48, 0, + 0, 0, 0, 1, 0, 0, 0, 156, + 3, 0, 0, 144, 4, 0, 0, 0, + 0, 0, 0, 20, 134, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 68, 88, 66, 67, 203, +117, 183, 110, 154, 52, 220, 70, 125, +228, 9, 112, 112, 45, 175, 213, 1, + 0, 0, 0, 156, 3, 0, 0, 6, + 0, 0, 0, 56, 0, 0, 0, 200, + 0, 0, 0, 176, 1, 0, 0, 44, + 2, 0, 0, 236, 2, 0, 0, 32, + 3, 0, 0, 65, 111, 110, 57, 136, + 0, 0, 0, 136, 0, 0, 0, 0, + 2, 255, 255, 96, 0, 0, 0, 40, + 0, 0, 0, 0, 0, 40, 0, 0, + 0, 40, 0, 0, 0, 40, 0, 1, + 0, 36, 0, 0, 0, 40, 0, 0, + 0, 0, 0, 1, 2, 255, 255, 31, + 0, 0, 2, 0, 0, 0, 128, 0, + 0, 3, 176, 31, 0, 0, 2, 0, + 0, 0, 144, 0, 8, 15, 160, 66, + 0, 0, 3, 0, 0, 15, 128, 0, + 0, 228, 176, 0, 8, 228, 160, 1, + 0, 0, 2, 0, 8, 15, 128, 0, + 0, 228, 128, 1, 0, 0, 2, 1, + 8, 15, 128, 0, 0, 228, 128, 1, + 0, 0, 2, 2, 8, 15, 128, 0, + 0, 228, 128, 1, 0, 0, 2, 3, + 8, 15, 128, 0, 0, 228, 128, 255, +255, 0, 0, 83, 72, 68, 82, 224, + 0, 0, 0, 64, 0, 0, 0, 56, + 0, 0, 0, 90, 0, 0, 3, 0, + 96, 16, 0, 0, 0, 0, 0, 88, + 24, 0, 4, 0, 112, 16, 0, 0, + 0, 0, 0, 85, 85, 0, 0, 98, + 16, 0, 3, 50, 16, 16, 0, 0, + 0, 0, 0, 101, 0, 0, 3, 242, + 32, 16, 0, 0, 0, 0, 0, 101, + 0, 0, 3, 242, 32, 16, 0, 1, + 0, 0, 0, 101, 0, 0, 3, 242, + 32, 16, 0, 2, 0, 0, 0, 101, + 0, 0, 3, 242, 32, 16, 0, 3, + 0, 0, 0, 104, 0, 0, 2, 1, + 0, 0, 0, 69, 0, 0, 9, 242, + 0, 16, 0, 0, 0, 0, 0, 70, + 16, 16, 0, 0, 0, 0, 0, 70, +126, 16, 0, 0, 0, 0, 0, 0, + 96, 16, 0, 0, 0, 0, 0, 54, + 0, 0, 5, 242, 32, 16, 0, 0, + 0, 0, 0, 70, 14, 16, 0, 0, + 0, 0, 0, 54, 0, 0, 5, 242, + 32, 16, 0, 1, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 54, + 0, 0, 5, 242, 32, 16, 0, 2, + 0, 0, 0, 70, 14, 16, 0, 0, + 0, 0, 0, 54, 0, 0, 5, 242, + 32, 16, 0, 3, 0, 0, 0, 70, + 14, 16, 0, 0, 0, 0, 0, 62, + 0, 0, 1, 83, 84, 65, 84, 116, + 0, 0, 0, 6, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 5, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 82, + 68, 69, 70, 184, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 28, 0, 0, 0, 0, + 4, 255, 255, 0, 65, 0, 0, 134, + 0, 0, 0, 92, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, + 0, 0, 0, 113, 0, 0, 0, 2, + 0, 0, 0, 5, 0, 0, 0, 4, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 1, 0, 0, 0, 13, + 0, 0, 0, 115, 97, 109, 112, 108, +101, 114, 95, 95, 67, 67, 95, 84, +101, 120, 116, 117, 114, 101, 48, 0, +116, 101, 120, 116, 117, 114, 101, 95, + 95, 67, 67, 95, 84, 101, 120, 116, +117, 114, 101, 48, 0, 77, 105, 99, +114, 111, 115, 111, 102, 116, 32, 40, + 82, 41, 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, 32, 67, +111, 109, 112, 105, 108, 101, 114, 32, + 54, 46, 51, 46, 57, 54, 48, 48, + 46, 49, 54, 51, 56, 52, 0, 73, + 83, 71, 78, 44, 0, 0, 0, 1, + 0, 0, 0, 8, 0, 0, 0, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 3, 3, 0, 0, 84, + 69, 88, 67, 79, 79, 82, 68, 0, +171, 171, 171, 79, 83, 71, 78, 116, + 0, 0, 0, 4, 0, 0, 0, 8, + 0, 0, 0, 104, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 15, + 0, 0, 0, 104, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 1, 0, 0, 0, 15, + 0, 0, 0, 104, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 2, 0, 0, 0, 15, + 0, 0, 0, 104, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 3, 0, 0, 0, 15, + 0, 0, 0, 83, 86, 95, 84, 97, +114, 103, 101, 116, 0, 171, 171, 68, + 88, 66, 67, 110, 14, 140, 120, 239, +110, 56, 78, 103, 37, 245, 162, 140, +151, 93, 223, 1, 0, 0, 0, 144, + 4, 0, 0, 6, 0, 0, 0, 56, + 0, 0, 0, 68, 1, 0, 0, 156, + 2, 0, 0, 24, 3, 0, 0, 236, + 3, 0, 0, 56, 4, 0, 0, 65, +111, 110, 57, 4, 1, 0, 0, 4, + 1, 0, 0, 0, 2, 254, 255, 208, + 0, 0, 0, 52, 0, 0, 0, 1, + 0, 36, 0, 0, 0, 48, 0, 0, + 0, 48, 0, 0, 0, 36, 0, 1, + 0, 48, 0, 0, 0, 0, 0, 4, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 2, 254, 255, 81, + 0, 0, 5, 5, 0, 15, 160, 0, + 0, 0, 63, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 31, + 0, 0, 2, 5, 0, 0, 128, 0, + 0, 15, 144, 31, 0, 0, 2, 5, + 0, 1, 128, 1, 0, 15, 144, 9, + 0, 0, 3, 0, 0, 1, 128, 3, + 0, 228, 160, 0, 0, 228, 144, 9, + 0, 0, 3, 0, 0, 2, 128, 4, + 0, 228, 160, 0, 0, 228, 144, 2, + 0, 0, 3, 0, 0, 1, 128, 0, + 0, 85, 128, 0, 0, 0, 128, 5, + 0, 0, 3, 0, 0, 4, 192, 0, + 0, 0, 128, 5, 0, 0, 160, 9, + 0, 0, 3, 0, 0, 1, 128, 2, + 0, 228, 160, 0, 0, 228, 144, 1, + 0, 0, 2, 1, 0, 2, 128, 0, + 0, 0, 129, 9, 0, 0, 3, 1, + 0, 1, 128, 1, 0, 228, 160, 0, + 0, 228, 144, 4, 0, 0, 4, 0, + 0, 3, 192, 0, 0, 85, 128, 0, + 0, 228, 160, 1, 0, 228, 128, 1, + 0, 0, 2, 0, 0, 8, 192, 0, + 0, 85, 128, 1, 0, 0, 2, 0, + 0, 3, 224, 1, 0, 228, 144, 255, +255, 0, 0, 83, 72, 68, 82, 80, + 1, 0, 0, 64, 0, 1, 0, 84, + 0, 0, 0, 89, 0, 0, 4, 70, +142, 32, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 95, 0, 0, 3, 242, + 16, 16, 0, 0, 0, 0, 0, 95, + 0, 0, 3, 50, 16, 16, 0, 1, + 0, 0, 0, 101, 0, 0, 3, 50, + 32, 16, 0, 0, 0, 0, 0, 103, + 0, 0, 4, 242, 32, 16, 0, 1, + 0, 0, 0, 1, 0, 0, 0, 104, + 0, 0, 2, 1, 0, 0, 0, 54, + 0, 0, 5, 50, 32, 16, 0, 0, + 0, 0, 0, 70, 16, 16, 0, 1, + 0, 0, 0, 17, 0, 0, 8, 18, + 0, 16, 0, 0, 0, 0, 0, 70, +142, 32, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 70, 30, 16, 0, 0, + 0, 0, 0, 54, 0, 0, 6, 34, + 32, 16, 0, 1, 0, 0, 0, 10, + 0, 16, 128, 65, 0, 0, 0, 0, + 0, 0, 0, 17, 0, 0, 8, 18, + 0, 16, 0, 0, 0, 0, 0, 70, +142, 32, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 70, 30, 16, 0, 0, + 0, 0, 0, 17, 0, 0, 8, 34, + 0, 16, 0, 0, 0, 0, 0, 70, +142, 32, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 70, 30, 16, 0, 0, + 0, 0, 0, 0, 0, 0, 7, 18, + 0, 16, 0, 0, 0, 0, 0, 26, + 0, 16, 0, 0, 0, 0, 0, 10, + 0, 16, 0, 0, 0, 0, 0, 54, + 0, 0, 5, 130, 32, 16, 0, 1, + 0, 0, 0, 26, 0, 16, 0, 0, + 0, 0, 0, 56, 0, 0, 7, 66, + 32, 16, 0, 1, 0, 0, 0, 10, + 0, 16, 0, 0, 0, 0, 0, 1, + 64, 0, 0, 0, 0, 0, 63, 17, + 0, 0, 8, 18, 32, 16, 0, 1, + 0, 0, 0, 70, 142, 32, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 70, + 30, 16, 0, 0, 0, 0, 0, 62, + 0, 0, 1, 83, 84, 65, 84, 116, + 0, 0, 0, 10, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 7, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 82, + 68, 69, 70, 204, 0, 0, 0, 1, + 0, 0, 0, 72, 0, 0, 0, 1, + 0, 0, 0, 28, 0, 0, 0, 0, + 4, 254, 255, 0, 65, 0, 0, 152, + 0, 0, 0, 60, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 36, 71, 108, 111, 98, + 97, 108, 115, 0, 171, 171, 171, 60, + 0, 0, 0, 1, 0, 0, 0, 96, + 0, 0, 0, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 120, + 0, 0, 0, 0, 0, 0, 0, 64, + 0, 0, 0, 2, 0, 0, 0, 136, + 0, 0, 0, 0, 0, 0, 0, 95, + 67, 67, 95, 77, 86, 80, 77, 97, +116, 114, 105, 120, 0, 171, 171, 3, + 0, 3, 0, 4, 0, 4, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 77, +105, 99, 114, 111, 115, 111, 102, 116, + 32, 40, 82, 41, 32, 72, 76, 83, + 76, 32, 83, 104, 97, 100, 101, 114, + 32, 67, 111, 109, 112, 105, 108, 101, +114, 32, 54, 46, 51, 46, 57, 54, + 48, 48, 46, 49, 54, 51, 56, 52, + 0, 171, 171, 73, 83, 71, 78, 68, + 0, 0, 0, 2, 0, 0, 0, 8, + 0, 0, 0, 56, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 15, + 15, 0, 0, 56, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 1, 0, 0, 0, 3, + 3, 0, 0, 84, 69, 88, 67, 79, + 79, 82, 68, 0, 171, 171, 171, 79, + 83, 71, 78, 80, 0, 0, 0, 2, + 0, 0, 0, 8, 0, 0, 0, 56, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 3, 12, 0, 0, 65, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 3, 0, 0, 0, 1, + 0, 0, 0, 15, 0, 0, 0, 84, + 69, 88, 67, 79, 79, 82, 68, 0, + 83, 86, 95, 80, 111, 115, 105, 116, +105, 111, 110, 0, 171, 171, 171, +}; + const int s_numPrograms = 15; -const int s_programLengths[] = {2528,3358,2775,4102,3556,2996,2990,3300,3025,3350,3022,2982,2502,2675,3746}; -const unsigned char* s_programs[] = {s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_4417BDCD87C486E7545CD55E0CB359CA4DBE59CC,s_4D8C5651F1F40F9A6F86BCF92EAC1F807C8B7EBD,s_5AB8DB57D1AF885A330F6D412926E002C77583E6,s_600D338F001630222A3BBB2BBD77CE56F9E52D9E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_96ED7DE7250A36B8CE0EF03106BD399F9992497A,s_A0A1EDA5193F66BAC3038D55186A3ADF35F4AB4C,s_B3632567FE5B23C2808A75D03CF8354DC9DB6137,s_C7D6F93DBEF6AC7B2792546CE7DC909CC3047DAB,s_DEB4FBAF8139EA1475C188A08B5C6AD1C473A768,s_E08D0EA3D0C617D5C94A0AD06B8387F8842C94E9,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_EF3272556C5A4049CC885FC4218F09A4A8145ECF}; -const char* s_programKeys[] = {"13E33F532157A58EC77EDE3B3112560A89D272B2","4417BDCD87C486E7545CD55E0CB359CA4DBE59CC","4D8C5651F1F40F9A6F86BCF92EAC1F807C8B7EBD","5AB8DB57D1AF885A330F6D412926E002C77583E6","600D338F001630222A3BBB2BBD77CE56F9E52D9E","67837675F2BB48C0E926316F505FC1538228E0FA","96ED7DE7250A36B8CE0EF03106BD399F9992497A","A0A1EDA5193F66BAC3038D55186A3ADF35F4AB4C","B3632567FE5B23C2808A75D03CF8354DC9DB6137","C7D6F93DBEF6AC7B2792546CE7DC909CC3047DAB","DEB4FBAF8139EA1475C188A08B5C6AD1C473A768","E08D0EA3D0C617D5C94A0AD06B8387F8842C94E9","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","EF3272556C5A4049CC885FC4218F09A4A8145ECF"}; +const int s_programLengths[] = {2990,2528,4102,3022,2996,3358,2982,3300,3350,3025,3556,2502,2675,3746,2775}; +const unsigned char* s_programs[] = {s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873,s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE,s_53938AB67AD93ABA0DDB87F3C9889304284E011E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_78250E25D1929D4A842050738140787BE42541C6,s_7B67DD242152D35ACC079265FAD9D03DC98182DE,s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5,s_92BE325B516F887D2C928EDE20ADF428DB01C038,s_A2377A827972A5466DA8637681045D32DA8A817D,s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_F46558C274182079784898CF4968CF431593D5E2,s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6}; +const char* s_programKeys[] = {"133478C5A874C1E6F59B418CE6C7C39F1AE0F873","13E33F532157A58EC77EDE3B3112560A89D272B2","1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE","53938AB67AD93ABA0DDB87F3C9889304284E011E","67837675F2BB48C0E926316F505FC1538228E0FA","78250E25D1929D4A842050738140787BE42541C6","7B67DD242152D35ACC079265FAD9D03DC98182DE","847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5","92BE325B516F887D2C928EDE20ADF428DB01C038","A2377A827972A5466DA8637681045D32DA8A817D","B5E27B4F3CF7236633255B28CBA530D6EE5CED86","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","F46558C274182079784898CF4968CF431593D5E2","F6BA4519AF2653A53D57FB5D5508F0D8617105D6"}; diff --git a/cocos/renderer/CCBatchCommand.cpp b/cocos/renderer/CCBatchCommand.cpp index 8cd92c148d..e122fc1344 100644 --- a/cocos/renderer/CCBatchCommand.cpp +++ b/cocos/renderer/CCBatchCommand.cpp @@ -25,8 +25,8 @@ #include "renderer/CCBatchCommand.h" #include "renderer/ccGLStateCache.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTextureAtlas.h" +#include "renderer/CCTexture2D.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCBatchCommand.h b/cocos/renderer/CCBatchCommand.h index d5920b369b..a91abdac22 100644 --- a/cocos/renderer/CCBatchCommand.h +++ b/cocos/renderer/CCBatchCommand.h @@ -25,7 +25,7 @@ #ifndef _CC_BATCHCOMMAND_H_ #define _CC_BATCHCOMMAND_H_ -#include "CCRenderCommand.h" +#include "renderer/CCRenderCommand.h" #include "renderer/CCGLProgram.h" #include "CCRenderCommandPool.h" diff --git a/cocos/renderer/CCCustomCommand.h b/cocos/renderer/CCCustomCommand.h index 03fdead69a..a1f1ea04f2 100644 --- a/cocos/renderer/CCCustomCommand.h +++ b/cocos/renderer/CCCustomCommand.h @@ -26,8 +26,8 @@ #ifndef _CC_CUSTOMCOMMAND_H_ #define _CC_CUSTOMCOMMAND_H_ -#include "CCRenderCommand.h" -#include "CCRenderCommandPool.h" +#include "renderer/CCRenderCommand.h" +#include "renderer/CCRenderCommandPool.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCGLProgram.cpp b/cocos/renderer/CCGLProgram.cpp index 8d43154f2c..421eec76da 100644 --- a/cocos/renderer/CCGLProgram.cpp +++ b/cocos/renderer/CCGLProgram.cpp @@ -26,19 +26,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCDirector.h" #include "renderer/CCGLProgram.h" -#include "renderer/ccGLStateCache.h" -#include "base/ccMacros.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/uthash.h" -#include "deprecated/CCString.h" -#include "CCGL.h" #ifndef WIN32 #include #endif +#include "base/CCDirector.h" +#include "base/ccMacros.h" +#include "base/uthash.h" +#include "renderer/ccGLStateCache.h" +#include "platform/CCFileUtils.h" +#include "CCGL.h" + +#include "deprecated/CCString.h" + #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "CCPrecompiledShaders.h" #endif @@ -69,6 +71,9 @@ const char* GLProgram::SHADER_NAME_LABEL_DISTANCEFIELD_GLOW = "ShaderLabelDFGlow const char* GLProgram::SHADER_NAME_LABEL_NORMAL = "ShaderLabelNormal"; const char* GLProgram::SHADER_NAME_LABEL_OUTLINE = "ShaderLabelOutline"; +const char* GLProgram::SHADER_3D_POSITION = "Shader3DPosition"; +const char* GLProgram::SHADER_3D_POSITION_TEXTURE = "Shader3DPositionTexture"; + // uniform names const char* GLProgram::UNIFORM_NAME_P_MATRIX = "CC_PMatrix"; diff --git a/cocos/renderer/CCGLProgram.h b/cocos/renderer/CCGLProgram.h index d77847e5a4..eb20990219 100644 --- a/cocos/renderer/CCGLProgram.h +++ b/cocos/renderer/CCGLProgram.h @@ -30,12 +30,13 @@ THE SOFTWARE. #ifndef __CCGLPROGRAM_H__ #define __CCGLPROGRAM_H__ +#include + #include "base/ccMacros.h" #include "base/CCRef.h" #include "base/ccTypes.h" #include "CCGL.h" #include "math/CCMath.h" -#include NS_CC_BEGIN @@ -126,6 +127,9 @@ public: static const char* SHADER_NAME_LABEL_DISTANCEFIELD_NORMAL; static const char* SHADER_NAME_LABEL_DISTANCEFIELD_GLOW; + //3D + static const char* SHADER_3D_POSITION; + static const char* SHADER_3D_POSITION_TEXTURE; // uniform names static const char* UNIFORM_NAME_P_MATRIX; diff --git a/cocos/renderer/CCGLProgramCache.cpp b/cocos/renderer/CCGLProgramCache.cpp index 9ea37905e0..a47e3a5842 100644 --- a/cocos/renderer/CCGLProgramCache.cpp +++ b/cocos/renderer/CCGLProgramCache.cpp @@ -26,6 +26,7 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/CCGLProgramCache.h" + #include "renderer/CCGLProgram.h" #include "renderer/ccShaders.h" #include "base/ccMacros.h" @@ -48,6 +49,8 @@ enum { kShaderType_LabelDistanceFieldGlow, kShaderType_LabelNormal, kShaderType_LabelOutline, + kShaderType_3DPosition, + kShaderType_3DPositionTex, kShaderType_MAX, }; @@ -188,6 +191,15 @@ void GLProgramCache::loadDefaultGLPrograms() p = new GLProgram(); loadDefaultGLProgram(p, kShaderType_LabelOutline); _programs.insert( std::make_pair(GLProgram::SHADER_NAME_LABEL_OUTLINE, p) ); + + p = new GLProgram(); + loadDefaultGLProgram(p, kShaderType_3DPosition); + _programs.insert( std::make_pair(GLProgram::SHADER_3D_POSITION, p) ); + + p = new GLProgram(); + loadDefaultGLProgram(p, kShaderType_3DPositionTex); + _programs.insert( std::make_pair(GLProgram::SHADER_3D_POSITION_TEXTURE, p) ); + } void GLProgramCache::reloadDefaultGLPrograms() @@ -276,6 +288,15 @@ void GLProgramCache::reloadDefaultGLPrograms() p = getGLProgram(GLProgram::SHADER_NAME_LABEL_OUTLINE); p->reset(); loadDefaultGLProgram(p, kShaderType_LabelOutline); + + p = getGLProgram(GLProgram::SHADER_3D_POSITION); + p->reset(); + loadDefaultGLProgram(p, kShaderType_3DPosition); + + p = getGLProgram(GLProgram::SHADER_3D_POSITION_TEXTURE); + p->reset(); + loadDefaultGLProgram(p, kShaderType_3DPositionTex); + } void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type) @@ -329,6 +350,12 @@ void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type) case kShaderType_LabelOutline: p->initWithByteArrays(ccLabel_vert, ccLabelOutline_frag); break; + case kShaderType_3DPosition: + p->initWithByteArrays(cc3D_PositionTex_vert, cc3D_Color_frag); + break; + case kShaderType_3DPositionTex: + p->initWithByteArrays(cc3D_PositionTex_vert, cc3D_ColorTex_frag); + break; default: CCLOG("cocos2d: %s:%d, error shader type", __FUNCTION__, __LINE__); return; diff --git a/cocos/renderer/CCGLProgramCache.h b/cocos/renderer/CCGLProgramCache.h index 1f9914f0f8..b57cf35563 100644 --- a/cocos/renderer/CCGLProgramCache.h +++ b/cocos/renderer/CCGLProgramCache.h @@ -28,11 +28,11 @@ THE SOFTWARE. #ifndef __CCGLPROGRAMCACHE_H__ #define __CCGLPROGRAMCACHE_H__ -#include "base/CCRef.h" - #include #include +#include "base/CCRef.h" + NS_CC_BEGIN class GLProgram; diff --git a/cocos/renderer/CCGLProgramState.cpp b/cocos/renderer/CCGLProgramState.cpp index 6f7f05e88e..eadae38e75 100644 --- a/cocos/renderer/CCGLProgramState.cpp +++ b/cocos/renderer/CCGLProgramState.cpp @@ -27,11 +27,12 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/CCGLProgramState.h" + #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramStateCache.h" #include "renderer/CCGLProgramCache.h" #include "renderer/ccGLStateCache.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" NS_CC_BEGIN @@ -240,11 +241,14 @@ void VertexAttribValue::setPointer(GLint size, GLenum type, GLboolean normalized GLProgramState* GLProgramState::create(GLProgram *glprogram) { GLProgramState* ret = nullptr; - ret = new (std::nothrow) GLProgramState; - if(!ret || !ret->init(glprogram)) - CC_SAFE_RELEASE(ret); - - return ret; + ret = new (std::nothrow) GLProgramState(); + if(ret && ret->init(glprogram)) + { + ret->autorelease(); + return ret; + } + CC_SAFE_DELETE(ret); + return nullptr; } GLProgramState* GLProgramState::getOrCreateWithGLProgramName(const std::string &glProgramName ) diff --git a/cocos/renderer/CCGLProgramState.h b/cocos/renderer/CCGLProgramState.h index fb117a9eed..babfed8fed 100644 --- a/cocos/renderer/CCGLProgramState.h +++ b/cocos/renderer/CCGLProgramState.h @@ -25,13 +25,13 @@ THE SOFTWARE. #ifndef __CCGLPROGRAMSTATE_H__ #define __CCGLPROGRAMSTATE_H__ +#include + #include "base/ccTypes.h" #include "base/CCVector.h" -#include "math/Vector2.h" -#include "math/Vector3.h" -#include "math/Vector4.h" - -#include +#include "math/Vec2.h" +#include "math/Vec3.h" +#include "math/Vec4.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCGLProgramStateCache.cpp b/cocos/renderer/CCGLProgramStateCache.cpp index 51ddef546a..dd80d592b4 100644 --- a/cocos/renderer/CCGLProgramStateCache.cpp +++ b/cocos/renderer/CCGLProgramStateCache.cpp @@ -23,6 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/CCGLProgramStateCache.h" + #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" diff --git a/cocos/renderer/CCGLProgramStateCache.h b/cocos/renderer/CCGLProgramStateCache.h index ed0bdbe499..88b6b41a9a 100644 --- a/cocos/renderer/CCGLProgramStateCache.h +++ b/cocos/renderer/CCGLProgramStateCache.h @@ -27,11 +27,10 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCVector.h" -#include "math/Vector2.h" -#include "math/Vector3.h" -#include "math/Vector4.h" - #include "base/CCMap.h" +#include "math/Vec2.h" +#include "math/Vec3.h" +#include "math/Vec4.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCGroupCommand.h b/cocos/renderer/CCGroupCommand.h index 2fe829a8e7..56748468f0 100644 --- a/cocos/renderer/CCGroupCommand.h +++ b/cocos/renderer/CCGroupCommand.h @@ -26,12 +26,12 @@ #ifndef _CC_GROUPCOMMAND_H_ #define _CC_GROUPCOMMAND_H_ +#include + #include "base/CCRef.h" #include "CCRenderCommand.h" #include "CCRenderCommandPool.h" -#include - NS_CC_BEGIN class GroupCommandManager : public Ref diff --git a/cocos/renderer/CCMeshCommand.cpp b/cocos/renderer/CCMeshCommand.cpp new file mode 100644 index 0000000000..974fecfcc0 --- /dev/null +++ b/cocos/renderer/CCMeshCommand.cpp @@ -0,0 +1,164 @@ +/**************************************************************************** + 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 "base/ccMacros.h" +#include "base/CCDirector.h" +#include "renderer/CCMeshCommand.h" +#include "renderer/ccGLStateCache.h" +#include "renderer/CCGLProgramState.h" +#include "renderer/CCRenderer.h" +#include "renderer/CCTextureAtlas.h" +#include "renderer/CCTexture2D.h" + +NS_CC_BEGIN + +MeshCommand::MeshCommand() +: _textureID(0) +, _blendType(BlendFunc::DISABLE) +, _glProgramState(nullptr) +, _cullFaceEnabled(false) +, _cullFace(GL_BACK) +, _depthTestEnabled(false) +, _depthWriteEnabled(false) +, _displayColor(1.0f, 1.0f, 1.0f, 1.0f) +{ + _type = RenderCommand::Type::MESH_COMMAND; +} + +void MeshCommand::init(float globalOrder, + GLuint textureID, + GLProgramState* glProgramState, + BlendFunc blendType, + GLuint vertexBuffer, + GLuint indexBuffer, + GLenum primitive, + GLenum indexFormat, + ssize_t indexCount, + const Mat4 &mv) +{ + CCASSERT(glProgramState, "GLProgramState cannot be nill"); + + _globalOrder = globalOrder; + _textureID = textureID; + _blendType = blendType; + _glProgramState = glProgramState; + + _vertexBuffer = vertexBuffer; + _indexBuffer = indexBuffer; + _primitive = primitive; + _indexFormat = indexFormat; + _indexCount = indexCount; + _mv = mv; +} + +void MeshCommand::setCullFaceEnabled(bool enable) +{ + _cullFaceEnabled = enable; +} + +void MeshCommand::setCullFace(GLenum cullFace) +{ + _cullFace = cullFace; +} + +void MeshCommand::setDepthTestEnabled(bool enable) +{ + _depthTestEnabled = enable; +} + +void MeshCommand::setDepthWriteEnabled(bool enable) +{ + _depthWriteEnabled = enable; +} + +void MeshCommand::setDisplayColor(const Vec4& color) +{ + _displayColor = color; +} + +MeshCommand::~MeshCommand() +{ +} + +void MeshCommand::applyRenderState() +{ + if (_cullFaceEnabled) + { + glEnable(GL_CULL_FACE); + glCullFace(_cullFace); + } + if (_depthTestEnabled) + { + glEnable(GL_DEPTH_TEST); + } + if (_depthWriteEnabled) + { + glDepthMask(GL_TRUE); + } +} + +void MeshCommand::restoreRenderState() +{ + if (_cullFaceEnabled) + { + glDisable(GL_CULL_FACE); + } + if (_depthTestEnabled) + { + glDisable(GL_DEPTH_TEST); + } + if (_depthWriteEnabled) + { + glDepthMask(GL_FALSE); + } +} + +void MeshCommand::execute() +{ + // set render state + applyRenderState(); + + // Set material + GL::bindTexture2D(_textureID); + GL::blendFunc(_blendType.src, _blendType.dst); + + glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer); + _glProgramState->setUniformVec4("u_color", _displayColor); + _glProgramState->apply(_mv); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer); + + // Draw + glDrawElements(_primitive, (GLsizei)_indexCount, _indexFormat, 0); + + CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, _indexCount); + + //restore render state + restoreRenderState(); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glBindBuffer(GL_ARRAY_BUFFER, 0); +} + +NS_CC_END \ No newline at end of file diff --git a/cocos/renderer/CCMeshCommand.h b/cocos/renderer/CCMeshCommand.h new file mode 100644 index 0000000000..b99793f40c --- /dev/null +++ b/cocos/renderer/CCMeshCommand.h @@ -0,0 +1,91 @@ +/**************************************************************************** + 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. + ****************************************************************************/ + +#ifndef _CC_MESHCOMMAND_H_ +#define _CC_MESHCOMMAND_H_ + +#include "CCRenderCommand.h" +#include "renderer/CCGLProgram.h" +#include "math/CCMath.h" +#include "CCRenderCommandPool.h" + +NS_CC_BEGIN + +class GLProgramState; + +//it is a common mesh +class MeshCommand : public RenderCommand +{ +public: + + MeshCommand(); + ~MeshCommand(); + + void init(float globalOrder, GLuint textureID, GLProgramState* glProgramState, BlendFunc blendType, GLuint vertexBuffer, GLuint indexBuffer, GLenum primitive, GLenum indexType, ssize_t indexCount, const Mat4 &mv); + + void setCullFaceEnabled(bool enable); + + void setCullFace(GLenum cullFace); + + void setDepthTestEnabled(bool enable); + + void setDepthWriteEnabled(bool enable); + + void setDisplayColor(const Vec4& color); + + void execute(); + +protected: + // apply renderstate + void applyRenderState(); + + //restore to all false + void restoreRenderState(); + + GLuint _textureID; + GLProgramState* _glProgramState; + BlendFunc _blendType; + + GLuint _textrueID; + + Vec4 _displayColor; // in order to support tint and fade in fade out + + GLuint _vertexBuffer; + GLuint _indexBuffer; + GLenum _primitive; + GLenum _indexFormat; + ssize_t _indexCount; + + // States, default value all false + bool _cullFaceEnabled; + GLenum _cullFace; + bool _depthTestEnabled; + bool _depthWriteEnabled; + + // ModelView transform + Mat4 _mv; +}; +NS_CC_END + +#endif //_CC_MESHCOMMAND_H_ diff --git a/cocos/renderer/CCQuadCommand.cpp b/cocos/renderer/CCQuadCommand.cpp index 1aae065718..4b497ff253 100644 --- a/cocos/renderer/CCQuadCommand.cpp +++ b/cocos/renderer/CCQuadCommand.cpp @@ -24,6 +24,7 @@ #include "renderer/CCQuadCommand.h" + #include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" diff --git a/cocos/renderer/CCRenderCommand.cpp b/cocos/renderer/CCRenderCommand.cpp index 578f28d426..0c11c5699b 100644 --- a/cocos/renderer/CCRenderCommand.cpp +++ b/cocos/renderer/CCRenderCommand.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "CCRenderCommand.h" +#include "renderer/CCRenderCommand.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCRenderCommand.h b/cocos/renderer/CCRenderCommand.h index a8eeb5a45a..01611aea7b 100644 --- a/cocos/renderer/CCRenderCommand.h +++ b/cocos/renderer/CCRenderCommand.h @@ -26,8 +26,9 @@ #ifndef __CCRENDERCOMMAND_H_ #define __CCRENDERCOMMAND_H_ -#include "base/CCPlatformMacros.h" #include + +#include "base/CCPlatformMacros.h" #include "base/ccTypes.h" NS_CC_BEGIN @@ -47,6 +48,7 @@ public: CUSTOM_COMMAND, BATCH_COMMAND, GROUP_COMMAND, + MESH_COMMAND, }; /** Get Render Command Id */ diff --git a/cocos/renderer/CCRenderCommandPool.h b/cocos/renderer/CCRenderCommandPool.h index cfc52ab416..a90ef31f76 100644 --- a/cocos/renderer/CCRenderCommandPool.h +++ b/cocos/renderer/CCRenderCommandPool.h @@ -28,7 +28,9 @@ #include #include + #include "base/CCPlatformMacros.h" + NS_CC_BEGIN template diff --git a/cocos/renderer/CCRenderer.cpp b/cocos/renderer/CCRenderer.cpp index f090b2e941..222118da6f 100644 --- a/cocos/renderer/CCRenderer.cpp +++ b/cocos/renderer/CCRenderer.cpp @@ -32,6 +32,7 @@ #include "renderer/CCGroupCommand.h" #include "renderer/CCGLProgramCache.h" #include "renderer/ccGLStateCache.h" +#include "renderer/CCMeshCommand.h" #include "base/CCConfiguration.h" #include "base/CCDirector.h" #include "base/CCEventDispatcher.h" @@ -318,6 +319,12 @@ void Renderer::visitRenderQueue(const RenderQueue& queue) auto cmd = static_cast(command); cmd->execute(); } + else if (RenderCommand::Type::MESH_COMMAND == commandType) + { + flush(); + auto cmd = static_cast(command); + cmd->execute(); + } else { CCLOGERROR("Unknown commands in renderQueue"); diff --git a/cocos/renderer/CCRenderer.h b/cocos/renderer/CCRenderer.h index cadb5acd4e..434214db09 100644 --- a/cocos/renderer/CCRenderer.h +++ b/cocos/renderer/CCRenderer.h @@ -26,13 +26,14 @@ #ifndef __CC_RENDERER_H_ #define __CC_RENDERER_H_ -#include "base/CCPlatformMacros.h" -#include "CCRenderCommand.h" -#include "renderer/CCGLProgram.h" -#include "CCGL.h" #include #include +#include "base/CCPlatformMacros.h" +#include "renderer/CCRenderCommand.h" +#include "renderer/CCGLProgram.h" +#include "CCGL.h" + NS_CC_BEGIN class EventListenerCustom; diff --git a/cocos/2d/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp similarity index 99% rename from cocos/2d/CCTexture2D.cpp rename to cocos/renderer/CCTexture2D.cpp index f6a6df9033..3477268257 100644 --- a/cocos/2d/CCTexture2D.cpp +++ b/cocos/renderer/CCTexture2D.cpp @@ -31,11 +31,12 @@ THE SOFTWARE. * https://devforums.apple.com/message/37855#37855 by a1studmuffin */ +#include "renderer/CCTexture2D.h" + #include "CCGL.h" -#include "2d/CCTexture2D.h" -#include "2d/platform/CCImage.h" -#include "2d/ccUtils.h" -#include "2d/platform/CCDevice.h" +#include "platform/CCImage.h" +#include "base/ccUtils.h" +#include "platform/CCDevice.h" #include "base/ccConfig.h" #include "base/ccMacros.h" #include "base/CCConfiguration.h" @@ -49,7 +50,7 @@ THE SOFTWARE. #if CC_ENABLE_CACHE_TEXTURE_DATA - #include "2d/CCTextureCache.h" + #include "renderer/CCTextureCache.h" #endif NS_CC_BEGIN diff --git a/cocos/2d/CCTexture2D.h b/cocos/renderer/CCTexture2D.h similarity index 100% rename from cocos/2d/CCTexture2D.h rename to cocos/renderer/CCTexture2D.h diff --git a/cocos/2d/CCTextureAtlas.cpp b/cocos/renderer/CCTextureAtlas.cpp similarity index 99% rename from cocos/2d/CCTextureAtlas.cpp rename to cocos/renderer/CCTextureAtlas.cpp index 847149e520..332a0246bb 100644 --- a/cocos/2d/CCTextureAtlas.cpp +++ b/cocos/renderer/CCTextureAtlas.cpp @@ -25,24 +25,25 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -// cocos2d -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" + +#include + #include "base/ccMacros.h" -#include "renderer/CCGLProgram.h" -#include "renderer/ccGLStateCache.h" #include "base/CCEventType.h" #include "base/CCDirector.h" -#include "CCGL.h" #include "base/CCConfiguration.h" -#include "renderer/CCRenderer.h" - -// support -#include "2d/CCTexture2D.h" -#include "deprecated/CCString.h" -#include #include "base/CCEventDispatcher.h" #include "base/CCEventListenerCustom.h" +#include "renderer/CCTextureCache.h" +#include "renderer/CCGLProgram.h" +#include "renderer/ccGLStateCache.h" +#include "renderer/CCRenderer.h" +#include "renderer/CCTexture2D.h" +#include "CCGL.h" + + +#include "deprecated/CCString.h" //According to some tests GL_TRIANGLE_STRIP is slower, MUCH slower. Probably I'm doing something very wrong diff --git a/cocos/2d/CCTextureAtlas.h b/cocos/renderer/CCTextureAtlas.h similarity index 99% rename from cocos/2d/CCTextureAtlas.h rename to cocos/renderer/CCTextureAtlas.h index 1916af4e94..5dd431d116 100644 --- a/cocos/2d/CCTextureAtlas.h +++ b/cocos/renderer/CCTextureAtlas.h @@ -28,10 +28,11 @@ THE SOFTWARE. #ifndef __CCTEXTURE_ATLAS_H__ #define __CCTEXTURE_ATLAS_H__ +#include + #include "base/ccTypes.h" #include "base/CCRef.h" #include "base/ccConfig.h" -#include NS_CC_BEGIN diff --git a/cocos/2d/CCTextureCache.cpp b/cocos/renderer/CCTextureCache.cpp similarity index 99% rename from cocos/2d/CCTextureCache.cpp rename to cocos/renderer/CCTextureCache.cpp index 44f52e9f49..87ebe6195d 100644 --- a/cocos/2d/CCTextureCache.cpp +++ b/cocos/renderer/CCTextureCache.cpp @@ -25,24 +25,26 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "renderer/CCTextureCache.h" + #include #include #include #include -#include "2d/CCTextureCache.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/ccUtils.h" #include "base/CCScheduler.h" +#include "platform/CCFileUtils.h" +#include "base/ccUtils.h" + #include "deprecated/CCString.h" #ifdef EMSCRIPTEN #include -#include "2d/platform/emscripten/CCTextureCacheEmscripten.h" +#include "platform/emscripten/CCTextureCacheEmscripten.h" #endif // EMSCRIPTEN using namespace std; diff --git a/cocos/2d/CCTextureCache.h b/cocos/renderer/CCTextureCache.h similarity index 98% rename from cocos/2d/CCTextureCache.h rename to cocos/renderer/CCTextureCache.h index e3e3437a19..993ceb6b0b 100644 --- a/cocos/2d/CCTextureCache.h +++ b/cocos/renderer/CCTextureCache.h @@ -38,11 +38,11 @@ THE SOFTWARE. #include #include "base/CCRef.h" -#include "2d/CCTexture2D.h" -#include "2d/platform/CCImage.h" +#include "renderer/CCTexture2D.h" +#include "platform/CCImage.h" #if CC_ENABLE_CACHE_TEXTURE_DATA - #include "2d/platform/CCImage.h" + #include "platform/CCImage.h" #include #endif diff --git a/cocos/renderer/CMakeLists.txt b/cocos/renderer/CMakeLists.txt index 35cc09b4d8..b86e1aed6c 100644 --- a/cocos/renderer/CMakeLists.txt +++ b/cocos/renderer/CMakeLists.txt @@ -1,15 +1,19 @@ set(COCOS_RENDERER_SRC - renderer/CCBatchCommand.cpp - renderer/CCCustomCommand.cpp - renderer/CCGLProgram.cpp - renderer/CCGLProgramState.cpp - renderer/CCGLProgramStateCache.cpp - renderer/CCGroupCommand.cpp - renderer/CCQuadCommand.cpp - renderer/CCRenderCommand.cpp - renderer/CCRenderer.cpp - renderer/CCGLProgramCache.cpp - renderer/ccGLStateCache.cpp - renderer/ccShaders.cpp + renderer/CCBatchCommand.cpp + renderer/CCCustomCommand.cpp + renderer/CCMeshCommand.cpp + renderer/CCGLProgramCache.cpp + renderer/CCGLProgram.cpp + renderer/CCGLProgramStateCache.cpp + renderer/CCGLProgramState.cpp + renderer/ccGLStateCache.cpp + renderer/CCGroupCommand.cpp + renderer/CCQuadCommand.cpp + renderer/CCRenderCommand.cpp + renderer/CCRenderer.cpp + renderer/ccShaders.cpp + renderer/CCTexture2D.cpp + renderer/CCTextureAtlas.cpp + renderer/CCTextureCache.cpp ) diff --git a/cocos/renderer/ccGLStateCache.cpp b/cocos/renderer/ccGLStateCache.cpp index 7f4db72592..33b85c9b7a 100644 --- a/cocos/renderer/ccGLStateCache.cpp +++ b/cocos/renderer/ccGLStateCache.cpp @@ -26,6 +26,7 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/ccGLStateCache.h" + #include "renderer/CCGLProgram.h" #include "base/CCDirector.h" #include "base/ccConfig.h" diff --git a/cocos/renderer/ccShader_3D_Color.frag b/cocos/renderer/ccShader_3D_Color.frag new file mode 100644 index 0000000000..d5f5913f97 --- /dev/null +++ b/cocos/renderer/ccShader_3D_Color.frag @@ -0,0 +1,15 @@ + +const char* cc3D_Color_frag = STRINGIFY( + +\n#ifdef GL_ES\n +varying lowp vec4 DestinationColor; +\n#else\n +varying vec4 DestinationColor; +\n#endif\n +uniform vec4 u_color; + +void main(void) +{ + gl_FragColor = u_color; +} +); diff --git a/cocos/renderer/ccShader_3D_ColorTex.frag b/cocos/renderer/ccShader_3D_ColorTex.frag new file mode 100644 index 0000000000..d7465c9013 --- /dev/null +++ b/cocos/renderer/ccShader_3D_ColorTex.frag @@ -0,0 +1,15 @@ + +const char* cc3D_ColorTex_frag = STRINGIFY( + +\n#ifdef GL_ES\n +varying mediump vec2 TextureCoordOut; +\n#else\n +varying vec2 TextureCoordOut; +\n#endif\n +uniform vec4 u_color; + +void main(void) +{ + gl_FragColor = texture2D(CC_Texture0, TextureCoordOut) * u_color; +} +); diff --git a/cocos/renderer/ccShader_3D_PositionTex.vert b/cocos/renderer/ccShader_3D_PositionTex.vert new file mode 100644 index 0000000000..0cc61a9643 --- /dev/null +++ b/cocos/renderer/ccShader_3D_PositionTex.vert @@ -0,0 +1,15 @@ + +const char* cc3D_PositionTex_vert = STRINGIFY( + +attribute vec4 a_position; +attribute vec2 a_texCoord; + +varying vec2 TextureCoordOut; + +void main(void) +{ + gl_Position = CC_MVPMatrix * a_position; + TextureCoordOut = a_texCoord; + TextureCoordOut.y = 1.0 - TextureCoordOut.y; +} +); diff --git a/cocos/renderer/ccShaders.cpp b/cocos/renderer/ccShaders.cpp index 4f825e9c75..8da8ba88c6 100644 --- a/cocos/renderer/ccShaders.cpp +++ b/cocos/renderer/ccShaders.cpp @@ -70,4 +70,9 @@ NS_CC_BEGIN #include "ccShader_Label_normal.frag" #include "ccShader_Label_outline.frag" +// +#include "ccShader_3D_PositionTex.vert" +#include "ccShader_3D_Color.frag" +#include "ccShader_3D_ColorTex.frag" + NS_CC_END diff --git a/cocos/renderer/ccShaders.h b/cocos/renderer/ccShaders.h index 77784deba4..4c9c832b9d 100644 --- a/cocos/renderer/ccShaders.h +++ b/cocos/renderer/ccShaders.h @@ -69,6 +69,9 @@ extern CC_DLL const GLchar * ccLabelOutline_frag; extern CC_DLL const GLchar * ccLabel_vert; +extern CC_DLL const GLchar * cc3D_PositionTex_vert; +extern CC_DLL const GLchar * cc3D_ColorTex_frag; +extern CC_DLL const GLchar * cc3D_Color_frag; // end of shaders group /// @} diff --git a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua index a8ac2f0373..df6d07b9ee 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua @@ -250,11 +250,6 @@ -- @param self -- @param #color3b_table color3b --------------------------------- --- @function [parent=#ControlButton] getColor --- @param self --- @return color3b_table#color3b_table ret (return value: color3b_table) - -------------------------------- -- @function [parent=#ControlButton] onTouchCancelled -- @param self @@ -267,9 +262,14 @@ -- @param #unsigned char char -------------------------------- --- @function [parent=#ControlButton] getOpacity +-- @function [parent=#ControlButton] updateDisplayedOpacity -- @param self --- @return unsigned char#unsigned char ret (return value: unsigned char) +-- @param #unsigned char char + +-------------------------------- +-- @function [parent=#ControlButton] updateDisplayedColor +-- @param self +-- @param #color3b_table color3b -------------------------------- -- @function [parent=#ControlButton] onTouchBegan diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua new file mode 100644 index 0000000000..264531e866 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua @@ -0,0 +1,36 @@ + +-------------------------------- +-- @module Sprite3D +-- @extend Node,BlendProtocol + +-------------------------------- +-- overload function: setTexture(cc.Texture2D) +-- +-- overload function: setTexture(string) +-- +-- @function [parent=#Sprite3D] setTexture +-- @param self +-- @param #string str + +-------------------------------- +-- @function [parent=#Sprite3D] getBlendFunc +-- @param self +-- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc) + +-------------------------------- +-- @function [parent=#Sprite3D] setBlendFunc +-- @param self +-- @param #cc.BlendFunc blendfunc + +-------------------------------- +-- overload function: create(string, string) +-- +-- overload function: create(string) +-- +-- @function [parent=#Sprite3D] create +-- @param self +-- @param #string str +-- @param #string str +-- @return Sprite3D#Sprite3D ret (retunr value: cc.Sprite3D) + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua index 9746f7803f..4a2120d628 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua @@ -81,6 +81,11 @@ -- @field [parent=#cc] FileUtils#FileUtils FileUtils preloaded module +-------------------------------------------------------- +-- the cc UserDefault +-- @field [parent=#cc] UserDefault#UserDefault UserDefault preloaded module + + -------------------------------------------------------- -- the cc EventListenerTouchOneByOne -- @field [parent=#cc] EventListenerTouchOneByOne#EventListenerTouchOneByOne EventListenerTouchOneByOne preloaded module @@ -1121,6 +1126,11 @@ -- @field [parent=#cc] TiledGrid3D#TiledGrid3D TiledGrid3D preloaded module +-------------------------------------------------------- +-- the cc TextureCache +-- @field [parent=#cc] TextureCache#TextureCache TextureCache preloaded module + + -------------------------------------------------------- -- the cc Application -- @field [parent=#cc] Application#Application Application preloaded module @@ -1146,16 +1156,6 @@ -- @field [parent=#cc] SpriteFrameCache#SpriteFrameCache SpriteFrameCache preloaded module --------------------------------------------------------- --- the cc UserDefault --- @field [parent=#cc] UserDefault#UserDefault UserDefault preloaded module - - --------------------------------------------------------- --- the cc TextureCache --- @field [parent=#cc] TextureCache#TextureCache TextureCache preloaded module - - -------------------------------------------------------- -- the cc ParallaxNode -- @field [parent=#cc] ParallaxNode#ParallaxNode ParallaxNode preloaded module @@ -1201,6 +1201,11 @@ -- @field [parent=#cc] Component#Component Component preloaded module +-------------------------------------------------------- +-- the cc Sprite3D +-- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module + + -------------------------------------------------------- -- the cc SimpleAudioEngine -- @field [parent=#cc] SimpleAudioEngine#SimpleAudioEngine SimpleAudioEngine preloaded module diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 5b7a65ffb1..e1486c569e 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -14172,6 +14172,714 @@ int lua_register_cocos2dx_FileUtils(lua_State* tolua_S) return 1; } +int lua_cocos2dx_UserDefault_setIntegerForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setIntegerForKey'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + const char* arg0; + int arg1; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + if(!ok) + return 0; + cobj->setIntegerForKey(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setIntegerForKey",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setIntegerForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getFloatForKey'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 2) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + double arg1; + ok &= luaval_to_number(tolua_S, 3,&arg1); + + if (!ok) { break; } + double ret = cobj->getFloatForKey(arg0, arg1); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + double ret = cobj->getFloatForKey(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFloatForKey",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getFloatForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getBoolForKey'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 2) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + bool arg1; + ok &= luaval_to_boolean(tolua_S, 3,&arg1); + + if (!ok) { break; } + bool ret = cobj->getBoolForKey(arg0, arg1); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + bool ret = cobj->getBoolForKey(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoolForKey",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getBoolForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_setDoubleForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setDoubleForKey'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + const char* arg0; + double arg1; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_number(tolua_S, 3,&arg1); + if(!ok) + return 0; + cobj->setDoubleForKey(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDoubleForKey",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setDoubleForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_setFloatForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setFloatForKey'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + const char* arg0; + double arg1; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_number(tolua_S, 3,&arg1); + if(!ok) + return 0; + cobj->setFloatForKey(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFloatForKey",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setFloatForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getStringForKey'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 2) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 3,&arg1); + + if (!ok) { break; } + std::string ret = cobj->getStringForKey(arg0, arg1); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + std::string ret = cobj->getStringForKey(arg0); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringForKey",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getStringForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_setStringForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setStringForKey'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + const char* arg0; + std::string arg1; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_std_string(tolua_S, 3,&arg1); + if(!ok) + return 0; + cobj->setStringForKey(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStringForKey",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setStringForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_flush(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_flush'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->flush(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "flush",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_flush'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getIntegerForKey'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 2) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + int arg1; + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + + if (!ok) { break; } + int ret = cobj->getIntegerForKey(arg0, arg1); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + int ret = cobj->getIntegerForKey(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIntegerForKey",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getIntegerForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getDoubleForKey'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 2) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + double arg1; + ok &= luaval_to_number(tolua_S, 3,&arg1); + + if (!ok) { break; } + double ret = cobj->getDoubleForKey(arg0, arg1); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + const char* arg0; + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + if (!ok) { break; } + double ret = cobj->getDoubleForKey(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDoubleForKey",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getDoubleForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_setBoolForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::UserDefault* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setBoolForKey'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + const char* arg0; + bool arg1; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1); + if(!ok) + return 0; + cobj->setBoolForKey(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBoolForKey",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setBoolForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_UserDefault_destroyInstance(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::UserDefault::destroyInstance(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_destroyInstance'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_UserDefault_getXMLFilePath(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + const std::string& ret = cocos2d::UserDefault::getXMLFilePath(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getXMLFilePath",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getXMLFilePath'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_UserDefault_isXMLFileExist(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cocos2d::UserDefault::isXMLFileExist(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "isXMLFileExist",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_isXMLFileExist'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_UserDefault_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (UserDefault)"); + return 0; +} + +int lua_register_cocos2dx_UserDefault(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.UserDefault"); + tolua_cclass(tolua_S,"UserDefault","cc.UserDefault","",nullptr); + + tolua_beginmodule(tolua_S,"UserDefault"); + tolua_function(tolua_S,"setIntegerForKey",lua_cocos2dx_UserDefault_setIntegerForKey); + tolua_function(tolua_S,"getFloatForKey",lua_cocos2dx_UserDefault_getFloatForKey); + tolua_function(tolua_S,"getBoolForKey",lua_cocos2dx_UserDefault_getBoolForKey); + tolua_function(tolua_S,"setDoubleForKey",lua_cocos2dx_UserDefault_setDoubleForKey); + tolua_function(tolua_S,"setFloatForKey",lua_cocos2dx_UserDefault_setFloatForKey); + tolua_function(tolua_S,"getStringForKey",lua_cocos2dx_UserDefault_getStringForKey); + tolua_function(tolua_S,"setStringForKey",lua_cocos2dx_UserDefault_setStringForKey); + tolua_function(tolua_S,"flush",lua_cocos2dx_UserDefault_flush); + tolua_function(tolua_S,"getIntegerForKey",lua_cocos2dx_UserDefault_getIntegerForKey); + tolua_function(tolua_S,"getDoubleForKey",lua_cocos2dx_UserDefault_getDoubleForKey); + tolua_function(tolua_S,"setBoolForKey",lua_cocos2dx_UserDefault_setBoolForKey); + tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_UserDefault_destroyInstance); + tolua_function(tolua_S,"getXMLFilePath", lua_cocos2dx_UserDefault_getXMLFilePath); + tolua_function(tolua_S,"isXMLFileExist", lua_cocos2dx_UserDefault_isXMLFileExist); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::UserDefault).name(); + g_luaType[typeName] = "cc.UserDefault"; + g_typeCast["UserDefault"] = "cc.UserDefault"; + return 1; +} + int lua_cocos2dx_EventListenerTouchOneByOne_isSwallowTouches(lua_State* tolua_S) { int argc = 0; @@ -54705,6 +55413,532 @@ int lua_register_cocos2dx_TiledGrid3D(lua_State* tolua_S) return 1; } +int lua_cocos2dx_TextureCache_reloadTexture(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_reloadTexture'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + if(!ok) + return 0; + bool ret = cobj->reloadTexture(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reloadTexture",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_reloadTexture'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_removeTextureForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeTextureForKey'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + if(!ok) + return 0; + cobj->removeTextureForKey(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTextureForKey",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeTextureForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_removeAllTextures(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeAllTextures'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllTextures(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllTextures",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeAllTextures'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_getDescription(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_getDescription'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->getDescription(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_getDescription'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_getCachedTextureInfo(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_getCachedTextureInfo'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->getCachedTextureInfo(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCachedTextureInfo",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_getCachedTextureInfo'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_addImage'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 2) { + cocos2d::Image* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Image",&arg0); + + if (!ok) { break; } + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 3,&arg1); + + if (!ok) { break; } + cocos2d::Texture2D* ret = cobj->addImage(arg0, arg1); + object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + + if (!ok) { break; } + cocos2d::Texture2D* ret = cobj->addImage(arg0); + object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addImage",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_addImage'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_getTextureForKey(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_getTextureForKey'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + if(!ok) + return 0; + cocos2d::Texture2D* ret = cobj->getTextureForKey(arg0); + object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureForKey",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_getTextureForKey'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_removeUnusedTextures(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeUnusedTextures'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeUnusedTextures(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeUnusedTextures",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeUnusedTextures'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_removeTexture(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeTexture'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Texture2D* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); + if(!ok) + return 0; + cobj->removeTexture(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTexture",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeTexture'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_waitForQuit(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_waitForQuit'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->waitForQuit(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "waitForQuit",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_waitForQuit'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_TextureCache_constructor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::TextureCache* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj = new cocos2d::TextureCache(); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TextureCache"); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextureCache",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_constructor'.",&tolua_err); +#endif + + return 0; +} + +static int lua_cocos2dx_TextureCache_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (TextureCache)"); + return 0; +} + +int lua_register_cocos2dx_TextureCache(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.TextureCache"); + tolua_cclass(tolua_S,"TextureCache","cc.TextureCache","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"TextureCache"); + tolua_function(tolua_S,"reloadTexture",lua_cocos2dx_TextureCache_reloadTexture); + tolua_function(tolua_S,"removeTextureForKey",lua_cocos2dx_TextureCache_removeTextureForKey); + tolua_function(tolua_S,"removeAllTextures",lua_cocos2dx_TextureCache_removeAllTextures); + tolua_function(tolua_S,"getDescription",lua_cocos2dx_TextureCache_getDescription); + tolua_function(tolua_S,"getCachedTextureInfo",lua_cocos2dx_TextureCache_getCachedTextureInfo); + tolua_function(tolua_S,"addImage",lua_cocos2dx_TextureCache_addImage); + tolua_function(tolua_S,"getTextureForKey",lua_cocos2dx_TextureCache_getTextureForKey); + tolua_function(tolua_S,"removeUnusedTextures",lua_cocos2dx_TextureCache_removeUnusedTextures); + tolua_function(tolua_S,"removeTexture",lua_cocos2dx_TextureCache_removeTexture); + tolua_function(tolua_S,"waitForQuit",lua_cocos2dx_TextureCache_waitForQuit); + tolua_function(tolua_S,"new",lua_cocos2dx_TextureCache_constructor); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::TextureCache).name(); + g_luaType[typeName] = "cc.TextureCache"; + g_typeCast["TextureCache"] = "cc.TextureCache"; + return 1; +} + int lua_cocos2dx_Application_getTargetPlatform(lua_State* tolua_S) { int argc = 0; @@ -57051,1240 +58285,6 @@ int lua_register_cocos2dx_SpriteFrameCache(lua_State* tolua_S) return 1; } -int lua_cocos2dx_UserDefault_setIntegerForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setIntegerForKey'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - const char* arg0; - int arg1; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - if(!ok) - return 0; - cobj->setIntegerForKey(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setIntegerForKey",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setIntegerForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getFloatForKey'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); - - if (!ok) { break; } - double ret = cobj->getFloatForKey(arg0, arg1); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - double ret = cobj->getFloatForKey(arg0); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFloatForKey",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getFloatForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getBoolForKey'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); - - if (!ok) { break; } - bool ret = cobj->getBoolForKey(arg0, arg1); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - bool ret = cobj->getBoolForKey(arg0); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoolForKey",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getBoolForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_setDoubleForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setDoubleForKey'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - const char* arg0; - double arg1; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->setDoubleForKey(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDoubleForKey",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setDoubleForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_setFloatForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setFloatForKey'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - const char* arg0; - double arg1; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->setFloatForKey(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFloatForKey",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setFloatForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getStringForKey'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - - if (!ok) { break; } - std::string ret = cobj->getStringForKey(arg0, arg1); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - std::string ret = cobj->getStringForKey(arg0); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringForKey",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getStringForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_setStringForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setStringForKey'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - const char* arg0; - std::string arg1; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->setStringForKey(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStringForKey",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setStringForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_flush(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_flush'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->flush(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "flush",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_flush'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getIntegerForKey'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - - if (!ok) { break; } - int ret = cobj->getIntegerForKey(arg0, arg1); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - int ret = cobj->getIntegerForKey(arg0); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIntegerForKey",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getIntegerForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_getDoubleForKey'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); - - if (!ok) { break; } - double ret = cobj->getDoubleForKey(arg0, arg1); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - if (!ok) { break; } - double ret = cobj->getDoubleForKey(arg0); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDoubleForKey",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getDoubleForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_setBoolForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::UserDefault* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::UserDefault*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_UserDefault_setBoolForKey'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - const char* arg0; - bool arg1; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - ok &= luaval_to_boolean(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->setBoolForKey(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBoolForKey",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_setBoolForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_UserDefault_destroyInstance(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::UserDefault::destroyInstance(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_destroyInstance'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_UserDefault_getXMLFilePath(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - const std::string& ret = cocos2d::UserDefault::getXMLFilePath(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getXMLFilePath",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_getXMLFilePath'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_UserDefault_isXMLFileExist(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.UserDefault",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cocos2d::UserDefault::isXMLFileExist(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "isXMLFileExist",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_UserDefault_isXMLFileExist'.",&tolua_err); -#endif - return 0; -} -static int lua_cocos2dx_UserDefault_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (UserDefault)"); - return 0; -} - -int lua_register_cocos2dx_UserDefault(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.UserDefault"); - tolua_cclass(tolua_S,"UserDefault","cc.UserDefault","",nullptr); - - tolua_beginmodule(tolua_S,"UserDefault"); - tolua_function(tolua_S,"setIntegerForKey",lua_cocos2dx_UserDefault_setIntegerForKey); - tolua_function(tolua_S,"getFloatForKey",lua_cocos2dx_UserDefault_getFloatForKey); - tolua_function(tolua_S,"getBoolForKey",lua_cocos2dx_UserDefault_getBoolForKey); - tolua_function(tolua_S,"setDoubleForKey",lua_cocos2dx_UserDefault_setDoubleForKey); - tolua_function(tolua_S,"setFloatForKey",lua_cocos2dx_UserDefault_setFloatForKey); - tolua_function(tolua_S,"getStringForKey",lua_cocos2dx_UserDefault_getStringForKey); - tolua_function(tolua_S,"setStringForKey",lua_cocos2dx_UserDefault_setStringForKey); - tolua_function(tolua_S,"flush",lua_cocos2dx_UserDefault_flush); - tolua_function(tolua_S,"getIntegerForKey",lua_cocos2dx_UserDefault_getIntegerForKey); - tolua_function(tolua_S,"getDoubleForKey",lua_cocos2dx_UserDefault_getDoubleForKey); - tolua_function(tolua_S,"setBoolForKey",lua_cocos2dx_UserDefault_setBoolForKey); - tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_UserDefault_destroyInstance); - tolua_function(tolua_S,"getXMLFilePath", lua_cocos2dx_UserDefault_getXMLFilePath); - tolua_function(tolua_S,"isXMLFileExist", lua_cocos2dx_UserDefault_isXMLFileExist); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::UserDefault).name(); - g_luaType[typeName] = "cc.UserDefault"; - g_typeCast["UserDefault"] = "cc.UserDefault"; - return 1; -} - -int lua_cocos2dx_TextureCache_reloadTexture(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_reloadTexture'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - bool ret = cobj->reloadTexture(arg0); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reloadTexture",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_reloadTexture'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_removeTextureForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeTextureForKey'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->removeTextureForKey(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTextureForKey",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeTextureForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_removeAllTextures(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeAllTextures'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->removeAllTextures(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllTextures",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeAllTextures'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_getDescription(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_getDescription'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - std::string ret = cobj->getDescription(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_getDescription'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_getCachedTextureInfo(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_getCachedTextureInfo'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - std::string ret = cobj->getCachedTextureInfo(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCachedTextureInfo",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_getCachedTextureInfo'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_addImage'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 2) { - cocos2d::Image* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Image",&arg0); - - if (!ok) { break; } - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - - if (!ok) { break; } - cocos2d::Texture2D* ret = cobj->addImage(arg0, arg1); - object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - - if (!ok) { break; } - cocos2d::Texture2D* ret = cobj->addImage(arg0); - object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addImage",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_addImage'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_getTextureForKey(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_getTextureForKey'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::Texture2D* ret = cobj->getTextureForKey(arg0); - object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureForKey",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_getTextureForKey'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_removeUnusedTextures(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeUnusedTextures'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->removeUnusedTextures(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeUnusedTextures",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeUnusedTextures'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_removeTexture(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_removeTexture'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Texture2D* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - if(!ok) - return 0; - cobj->removeTexture(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTexture",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_removeTexture'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_waitForQuit(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.TextureCache",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::TextureCache*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_TextureCache_waitForQuit'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->waitForQuit(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "waitForQuit",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_waitForQuit'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_TextureCache_constructor(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::TextureCache* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj = new cocos2d::TextureCache(); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TextureCache"); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextureCache",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_constructor'.",&tolua_err); -#endif - - return 0; -} - -static int lua_cocos2dx_TextureCache_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (TextureCache)"); - return 0; -} - -int lua_register_cocos2dx_TextureCache(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.TextureCache"); - tolua_cclass(tolua_S,"TextureCache","cc.TextureCache","cc.Ref",nullptr); - - tolua_beginmodule(tolua_S,"TextureCache"); - tolua_function(tolua_S,"reloadTexture",lua_cocos2dx_TextureCache_reloadTexture); - tolua_function(tolua_S,"removeTextureForKey",lua_cocos2dx_TextureCache_removeTextureForKey); - tolua_function(tolua_S,"removeAllTextures",lua_cocos2dx_TextureCache_removeAllTextures); - tolua_function(tolua_S,"getDescription",lua_cocos2dx_TextureCache_getDescription); - tolua_function(tolua_S,"getCachedTextureInfo",lua_cocos2dx_TextureCache_getCachedTextureInfo); - tolua_function(tolua_S,"addImage",lua_cocos2dx_TextureCache_addImage); - tolua_function(tolua_S,"getTextureForKey",lua_cocos2dx_TextureCache_getTextureForKey); - tolua_function(tolua_S,"removeUnusedTextures",lua_cocos2dx_TextureCache_removeUnusedTextures); - tolua_function(tolua_S,"removeTexture",lua_cocos2dx_TextureCache_removeTexture); - tolua_function(tolua_S,"waitForQuit",lua_cocos2dx_TextureCache_waitForQuit); - tolua_function(tolua_S,"new",lua_cocos2dx_TextureCache_constructor); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::TextureCache).name(); - g_luaType[typeName] = "cc.TextureCache"; - g_typeCast["TextureCache"] = "cc.TextureCache"; - return 1; -} - int lua_cocos2dx_ParallaxNode_addChild(lua_State* tolua_S) { int argc = 0; @@ -63487,6 +63487,223 @@ int lua_register_cocos2dx_Component(lua_State* tolua_S) return 1; } +int lua_cocos2dx_Sprite3D_setTexture(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Sprite3D* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Sprite3D",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::Sprite3D*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Sprite3D_setTexture'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 1) { + cocos2d::Texture2D* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); + + if (!ok) { break; } + cobj->setTexture(arg0); + return 0; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + + if (!ok) { break; } + cobj->setTexture(arg0); + return 0; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3D_setTexture'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Sprite3D_getBlendFunc(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Sprite3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Sprite3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Sprite3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Sprite3D_getBlendFunc'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::BlendFunc& ret = cobj->getBlendFunc(); + blendfunc_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3D_getBlendFunc'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Sprite3D_setBlendFunc(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Sprite3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Sprite3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Sprite3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Sprite3D_setBlendFunc'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::BlendFunc arg0; + + #pragma warning NO CONVERSION TO NATIVE FOR BlendFunc; + if(!ok) + return 0; + cobj->setBlendFunc(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3D_setBlendFunc'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Sprite3D_create(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.Sprite3D",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S)-1; + + do + { + if (argc == 2) + { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + if (!ok) { break; } + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 3,&arg1); + if (!ok) { break; } + cocos2d::Sprite3D* ret = cocos2d::Sprite3D::create(arg0, arg1); + object_to_luaval(tolua_S, "cc.Sprite3D",(cocos2d::Sprite3D*)ret); + return 1; + } + } while (0); + ok = true; + do + { + if (argc == 1) + { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + if (!ok) { break; } + cocos2d::Sprite3D* ret = cocos2d::Sprite3D::create(arg0); + object_to_luaval(tolua_S, "cc.Sprite3D",(cocos2d::Sprite3D*)ret); + return 1; + } + } while (0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3D_create'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_Sprite3D_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Sprite3D)"); + return 0; +} + +int lua_register_cocos2dx_Sprite3D(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Sprite3D"); + tolua_cclass(tolua_S,"Sprite3D","cc.Sprite3D","cc.Node",nullptr); + + tolua_beginmodule(tolua_S,"Sprite3D"); + tolua_function(tolua_S,"setTexture",lua_cocos2dx_Sprite3D_setTexture); + tolua_function(tolua_S,"getBlendFunc",lua_cocos2dx_Sprite3D_getBlendFunc); + tolua_function(tolua_S,"setBlendFunc",lua_cocos2dx_Sprite3D_setBlendFunc); + tolua_function(tolua_S,"create", lua_cocos2dx_Sprite3D_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Sprite3D).name(); + g_luaType[typeName] = "cc.Sprite3D"; + g_typeCast["Sprite3D"] = "cc.Sprite3D"; + return 1; +} + int lua_cocos2dx_SimpleAudioEngine_preloadBackgroundMusic(lua_State* tolua_S) { int argc = 0; @@ -65291,6 +65508,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_NodeGrid(tolua_S); lua_register_cocos2dx_TMXLayerInfo(tolua_S); lua_register_cocos2dx_EaseSineIn(tolua_S); + lua_register_cocos2dx_Sprite3D(tolua_S); lua_register_cocos2dx_EventListenerMouse(tolua_S); lua_register_cocos2dx_TiledGrid3D(tolua_S); lua_register_cocos2dx_ParticleGalaxy(tolua_S); @@ -65323,7 +65541,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_Menu(tolua_S); lua_register_cocos2dx_SpriteFrame(tolua_S); lua_register_cocos2dx_ActionManager(tolua_S); - lua_register_cocos2dx_TransitionFade(tolua_S); + lua_register_cocos2dx_UserDefault(tolua_S); lua_register_cocos2dx_TransitionZoomFlipX(tolua_S); lua_register_cocos2dx_EventFocus(tolua_S); lua_register_cocos2dx_EaseQuinticActionInOut(tolua_S); @@ -65358,6 +65576,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_TMXMapInfo(tolua_S); lua_register_cocos2dx_EaseExponentialIn(tolua_S); lua_register_cocos2dx_ReuseGrid(tolua_S); + lua_register_cocos2dx_ProtectedNode(tolua_S); lua_register_cocos2dx_EaseQuinticActionOut(tolua_S); lua_register_cocos2dx_EventDispatcher(tolua_S); lua_register_cocos2dx_MenuItemAtlasFont(tolua_S); @@ -65378,7 +65597,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_MenuItemToggle(tolua_S); lua_register_cocos2dx_RemoveSelf(tolua_S); lua_register_cocos2dx_SplitCols(tolua_S); - lua_register_cocos2dx_ProtectedNode(tolua_S); + lua_register_cocos2dx_TransitionFade(tolua_S); lua_register_cocos2dx_MotionStreak(tolua_S); lua_register_cocos2dx_RotateBy(tolua_S); lua_register_cocos2dx_FileUtils(tolua_S); @@ -65392,7 +65611,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_EaseBounceInOut(tolua_S); lua_register_cocos2dx_TransitionSlideInR(tolua_S); lua_register_cocos2dx_ParallaxNode(tolua_S); - lua_register_cocos2dx_UserDefault(tolua_S); lua_register_cocos2dx_EaseQuadraticActionIn(tolua_S); lua_register_cocos2dx_WavesTiles3D(tolua_S); lua_register_cocos2dx_TransitionSlideInB(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 682e55e5be..62a4c37607 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1558,6 +1558,11 @@ int register_all_cocos2dx(lua_State* tolua_S); + + + + + diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h index d57da90df3..1b43120fd2 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h @@ -31,7 +31,7 @@ extern "C" { } #include "cocos2d.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include "CCLuaStack.h" #include "CCLuaValue.h" #include "LuaScriptHandlerMgr.h" diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp index 2a02e89c6a..1d4425767c 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp @@ -6,8 +6,8 @@ #include "CCLuaValue.h" #include "CCLuaEngine.h" -#ifndef CC_SAFE_FREE -#define CC_SAFE_FREE(p) { if(p) free(p); p = nullptr; } +#ifndef CC_SAFE_DELETE_ARRAY +#define do { if(p) { delete[] (p); (p) = nullptr; } } while(0) #endif int lua_cocos2dx_physics_PhysicsBody_getJoints(lua_State* tolua_S) @@ -334,11 +334,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createPolygon(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -366,11 +366,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) ok &= luaval_to_physics_material(tolua_S, 3, &arg2); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createPolygon(arg0, arg1, arg2); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) @@ -401,11 +401,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) ok &= luaval_to_vec2(tolua_S, 4, &arg3); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createPolygon(arg0, arg1, arg2, arg3); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -455,11 +455,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgePolygon(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -487,11 +487,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) ok &= luaval_to_physics_material(tolua_S, 3, &arg2); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgePolygon(arg0, arg1, arg2); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -521,11 +521,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) ok &= luaval_to_number(tolua_S, 4,&arg3); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgePolygon(arg0, arg1, arg2, arg3); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -575,11 +575,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeChain(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -607,11 +607,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) ok &= luaval_to_physics_material(tolua_S, 3, &arg2); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeChain(arg0, arg1, arg2); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -641,11 +641,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) ok &= luaval_to_number(tolua_S, 4,&arg3); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeChain(arg0, arg1, arg2, arg3); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); do { if (nullptr != ret) { @@ -695,12 +695,12 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShape::recenterPoints(arg0, arg1); vec2_array_to_luaval(tolua_S, arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } @@ -717,12 +717,12 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) ok &= luaval_to_vec2(tolua_S, 3, &arg2); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShape::recenterPoints(arg0, arg1, arg2); vec2_array_to_luaval(tolua_S, arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "recenterPoints",argc, 2); @@ -760,11 +760,11 @@ int lua_cocos2dx_physics_PhysicsShape_getPolyonCenter(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::Vec2 ret = cocos2d::PhysicsShape::getPolyonCenter(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); vec2_to_luaval(tolua_S, ret); return 1; } @@ -849,7 +849,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPoints(lua_State* tolua_S) cocos2d::Vec2* arg0 = new cocos2d::Vec2[count]; cobj->getPoints(arg0); vec2_array_to_luaval(tolua_S, arg0, count); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoints",argc, 1); @@ -890,11 +890,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapePolygon* ret = cocos2d::PhysicsShapePolygon::create(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapePolygon",(cocos2d::PhysicsShapePolygon*)ret); return 1; } @@ -911,11 +911,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) ok &= luaval_to_physics_material(tolua_S, 3, &arg2); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapePolygon* ret = cocos2d::PhysicsShapePolygon::create(arg0, arg1, arg2); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapePolygon",(cocos2d::PhysicsShapePolygon*)ret); return 1; } @@ -934,11 +934,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) ok &= luaval_to_vec2(tolua_S, 4, &arg3); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapePolygon* ret = cocos2d::PhysicsShapePolygon::create(arg0, arg1, arg2, arg3); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapePolygon",(cocos2d::PhysicsShapePolygon*)ret); return 1; } @@ -976,11 +976,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateArea(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } double ret = cocos2d::PhysicsShapePolygon::calculateArea(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } @@ -1020,11 +1020,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg1); + CC_SAFE_DELETE_ARRAY(arg1); return 0; } double ret = cocos2d::PhysicsShapePolygon::calculateMoment(arg0, arg1, arg2); - CC_SAFE_FREE(arg1); + CC_SAFE_DELETE_ARRAY(arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } @@ -1043,11 +1043,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) ok &= luaval_to_vec2(tolua_S, 4, &arg3); if(!ok) { - CC_SAFE_FREE(arg1); + CC_SAFE_DELETE_ARRAY(arg1); return 0; } double ret = cocos2d::PhysicsShapePolygon::calculateMoment(arg0, arg1, arg2, arg3); - CC_SAFE_FREE(arg1); + CC_SAFE_DELETE_ARRAY(arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } @@ -1090,7 +1090,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_getPoints(lua_State* tolua_S) cocos2d::Vec2* arg0 = new cocos2d::Vec2[count]; cobj->getPoints(arg0); vec2_array_to_luaval(tolua_S, arg0, count); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoints",argc, 1); @@ -1134,7 +1134,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_getPoints(lua_State* tolua_S) cocos2d::Vec2* arg0 = new cocos2d::Vec2[count]; cobj->getPoints(arg0); vec2_array_to_luaval(tolua_S, arg0, count); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoints",argc, 1); @@ -1178,7 +1178,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_getPoints(lua_State* tolua_S) cocos2d::Vec2* arg0 = new cocos2d::Vec2[count]; cobj->getPoints(arg0); vec2_array_to_luaval(tolua_S, arg0, count); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoints",argc, 1); @@ -1322,11 +1322,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapeEdgePolygon* ret = cocos2d::PhysicsShapeEdgePolygon::create(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgePolygon",(cocos2d::PhysicsShapeEdgePolygon*)ret); return 1; } @@ -1343,11 +1343,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) ok &= luaval_to_physics_material(tolua_S, 3, &arg2); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapeEdgePolygon* ret = cocos2d::PhysicsShapeEdgePolygon::create(arg0, arg1, arg2); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgePolygon",(cocos2d::PhysicsShapeEdgePolygon*)ret); return 1; } @@ -1366,11 +1366,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) ok &= luaval_to_number(tolua_S, 4,&arg3); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapeEdgePolygon* ret = cocos2d::PhysicsShapeEdgePolygon::create(arg0, arg1, arg2, arg3); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgePolygon",(cocos2d::PhysicsShapeEdgePolygon*)ret); return 1; } @@ -1409,11 +1409,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) }} while (0); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapeEdgeChain* ret = cocos2d::PhysicsShapeEdgeChain::create(arg0, arg1); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgeChain",(cocos2d::PhysicsShapeEdgeChain*)ret); return 1; } @@ -1430,11 +1430,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) ok &= luaval_to_physics_material(tolua_S, 3, &arg2); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapeEdgeChain* ret = cocos2d::PhysicsShapeEdgeChain::create(arg0, arg1, arg2); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgeChain",(cocos2d::PhysicsShapeEdgeChain*)ret); return 1; } @@ -1453,11 +1453,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) ok &= luaval_to_number(tolua_S, 4,&arg3); if(!ok) { - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); return 0; } cocos2d::PhysicsShapeEdgeChain* ret = cocos2d::PhysicsShapeEdgeChain::create(arg0, arg1, arg2, arg3); - CC_SAFE_FREE(arg0); + CC_SAFE_DELETE_ARRAY(arg0); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgeChain",(cocos2d::PhysicsShapeEdgeChain*)ret); return 1; } diff --git a/cocos/scripting/lua-bindings/manual/lua_debugger.c b/cocos/scripting/lua-bindings/manual/lua_debugger.c index 9ad446c352..1ed753b639 100644 --- a/cocos/scripting/lua-bindings/manual/lua_debugger.c +++ b/cocos/scripting/lua-bindings/manual/lua_debugger.c @@ -2464,596 +2464,601 @@ static const char lua_m_ldt_debugger[] = { 0x07,0x5f,0x47,0x0b,0x73,0x74,0x72,0x69,0x6e,0x67,0x0c,0x72,0x65,0x71,0x75,0x69, 0x72,0x65,0x1d,0x00,0x02,0x06,0x01,0x00,0x00,0x05,0x2b,0x02,0x00,0x00,0x10,0x03, 0x00,0x00,0x27,0x04,0x01,0x00,0x10,0x05,0x01,0x00,0x40,0x02,0x04,0x00,0x14,0xc0, - 0xb0,0x01,0x02,0x00,0x07,0x00,0x0a,0x01,0x1c,0x32,0x00,0x03,0x00,0x43,0x01,0x00, - 0x00,0x3c,0x01,0x00,0x00,0x27,0x01,0x01,0x00,0x34,0x02,0x00,0x00,0x25,0x03,0x01, - 0x00,0x43,0x04,0x00,0x00,0x3d,0x02,0x01,0x02,0x27,0x03,0x01,0x00,0x49,0x01,0x05, - 0x80,0x34,0x05,0x02,0x00,0x36,0x06,0x04,0x00,0x3e,0x05,0x02,0x02,0x39,0x05,0x04, - 0x00,0x4b,0x01,0xfb,0x7f,0x34,0x01,0x03,0x00,0x37,0x01,0x04,0x01,0x10,0x02,0x01, - 0x00,0x37,0x01,0x05,0x01,0x34,0x03,0x06,0x00,0x37,0x03,0x07,0x03,0x10,0x04,0x00, - 0x00,0x25,0x05,0x08,0x00,0x3e,0x03,0x03,0x02,0x25,0x04,0x09,0x00,0x24,0x03,0x04, - 0x03,0x3e,0x01,0x03,0x01,0x47,0x00,0x01,0x00,0x06,0x0a,0x06,0x09,0x0b,0x63,0x6f, - 0x6e,0x63,0x61,0x74,0x0a,0x74,0x61,0x62,0x6c,0x65,0x0a,0x77,0x72,0x69,0x74,0x65, - 0x0b,0x73,0x74,0x64,0x6f,0x75,0x74,0x07,0x69,0x6f,0x0d,0x74,0x6f,0x73,0x74,0x72, - 0x69,0x6e,0x67,0x06,0x23,0x0b,0x73,0x65,0x6c,0x65,0x63,0x74,0x03,0x80,0x80,0xc0, - 0x99,0x04,0x3d,0x00,0x01,0x03,0x00,0x04,0x00,0x08,0x34,0x01,0x00,0x00,0x37,0x01, - 0x01,0x01,0x37,0x01,0x02,0x01,0x10,0x02,0x00,0x00,0x3e,0x01,0x02,0x01,0x34,0x01, - 0x00,0x00,0x37,0x01,0x03,0x01,0x48,0x01,0x02,0x00,0x0b,0x73,0x74,0x64,0x6f,0x75, - 0x74,0x0b,0x6f,0x75,0x74,0x70,0x75,0x74,0x09,0x62,0x61,0x73,0x65,0x07,0x69,0x6f, - 0x0b,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x47,0x00,0x01,0x00,0x8b,0x02,0x02,0x01, - 0x08,0x02,0x10,0x01,0x28,0x32,0x01,0x03,0x00,0x43,0x02,0x01,0x00,0x3c,0x02,0x00, - 0x00,0x27,0x02,0x01,0x00,0x34,0x03,0x00,0x00,0x25,0x04,0x01,0x00,0x43,0x05,0x01, - 0x00,0x3d,0x03,0x01,0x02,0x27,0x04,0x01,0x00,0x49,0x02,0x05,0x80,0x34,0x06,0x02, - 0x00,0x36,0x07,0x05,0x01,0x3e,0x06,0x02,0x02,0x39,0x06,0x05,0x01,0x4b,0x02,0xfb, - 0x7f,0x34,0x02,0x03,0x00,0x37,0x02,0x04,0x02,0x10,0x03,0x01,0x00,0x3e,0x02,0x02, - 0x02,0x10,0x03,0x02,0x00,0x37,0x02,0x05,0x02,0x25,0x04,0x06,0x00,0x25,0x05,0x07, - 0x00,0x3e,0x02,0x04,0x02,0x10,0x01,0x02,0x00,0x2b,0x02,0x00,0x00,0x37,0x02,0x08, - 0x02,0x37,0x03,0x09,0x00,0x33,0x04,0x0a,0x00,0x33,0x05,0x0c,0x00,0x37,0x06,0x0b, - 0x00,0x3a,0x06,0x0d,0x05,0x3a,0x05,0x0e,0x04,0x2b,0x05,0x01,0x00,0x37,0x05,0x0f, - 0x05,0x10,0x06,0x01,0x00,0x3e,0x05,0x02,0x00,0x3c,0x05,0x00,0x00,0x3e,0x02,0x03, - 0x01,0x47,0x00,0x01,0x00,0x05,0xc0,0x03,0xc0,0x08,0x62,0x36,0x34,0x09,0x61,0x74, - 0x74,0x72,0x09,0x74,0x79,0x70,0x65,0x01,0x00,0x00,0x09,0x6d,0x6f,0x64,0x65,0x01, - 0x00,0x01,0x08,0x74,0x61,0x67,0x0b,0x73,0x74,0x72,0x65,0x61,0x6d,0x08,0x73,0x6b, - 0x74,0x0d,0x73,0x65,0x6e,0x64,0x5f,0x78,0x6d,0x6c,0x07,0x0d,0x0a,0x06,0x0a,0x09, - 0x67,0x73,0x75,0x62,0x0b,0x63,0x6f,0x6e,0x63,0x61,0x74,0x0a,0x74,0x61,0x62,0x6c, - 0x65,0x0d,0x74,0x6f,0x73,0x74,0x72,0x69,0x6e,0x67,0x06,0x23,0x0b,0x73,0x65,0x6c, - 0x65,0x63,0x74,0x03,0x80,0x80,0xc0,0x99,0x04,0x68,0x02,0x01,0x04,0x01,0x05,0x00, - 0x0f,0x2b,0x01,0x00,0x00,0x37,0x01,0x00,0x01,0x37,0x01,0x01,0x01,0x10,0x02,0x00, - 0x00,0x43,0x03,0x01,0x00,0x3d,0x01,0x01,0x01,0x34,0x01,0x02,0x00,0x37,0x01,0x03, - 0x01,0x37,0x02,0x04,0x00,0x36,0x01,0x02,0x01,0x10,0x02,0x01,0x00,0x37,0x01,0x01, - 0x01,0x43,0x03,0x01,0x00,0x3d,0x01,0x01,0x01,0x47,0x00,0x01,0x00,0x02,0xc0,0x09, - 0x6d,0x6f,0x64,0x65,0x09,0x62,0x61,0x73,0x65,0x07,0x69,0x6f,0x0a,0x77,0x72,0x69, - 0x74,0x65,0x14,0x72,0x65,0x64,0x69,0x72,0x65,0x63,0x74,0x5f,0x6f,0x75,0x74,0x70, - 0x75,0x74,0x25,0x02,0x01,0x04,0x00,0x02,0x00,0x05,0x37,0x01,0x00,0x00,0x10,0x02, - 0x01,0x00,0x37,0x01,0x01,0x01,0x43,0x03,0x01,0x00,0x3f,0x01,0x01,0x00,0x0a,0x66, - 0x6c,0x75,0x73,0x68,0x08,0x6f,0x75,0x74,0x25,0x02,0x01,0x04,0x00,0x02,0x00,0x05, - 0x37,0x01,0x00,0x00,0x10,0x02,0x01,0x00,0x37,0x01,0x01,0x01,0x43,0x03,0x01,0x00, - 0x3f,0x01,0x01,0x00,0x0a,0x63,0x6c,0x6f,0x73,0x65,0x08,0x6f,0x75,0x74,0x27,0x02, - 0x01,0x04,0x00,0x02,0x00,0x05,0x37,0x01,0x00,0x00,0x10,0x02,0x01,0x00,0x37,0x01, - 0x01,0x01,0x43,0x03,0x01,0x00,0x3f,0x01,0x01,0x00,0x0c,0x73,0x65,0x74,0x76,0x62, - 0x75,0x66,0x08,0x6f,0x75,0x74,0x24,0x02,0x01,0x04,0x00,0x02,0x00,0x05,0x37,0x01, + 0x3d,0x00,0x01,0x03,0x00,0x04,0x00,0x08,0x34,0x01,0x00,0x00,0x37,0x01,0x01,0x01, + 0x37,0x01,0x02,0x01,0x10,0x02,0x00,0x00,0x3e,0x01,0x02,0x01,0x34,0x01,0x00,0x00, + 0x37,0x01,0x03,0x01,0x48,0x01,0x02,0x00,0x0b,0x73,0x74,0x64,0x6f,0x75,0x74,0x0b, + 0x6f,0x75,0x74,0x70,0x75,0x74,0x09,0x62,0x61,0x73,0x65,0x07,0x69,0x6f,0x0b,0x00, + 0x00,0x01,0x00,0x00,0x00,0x01,0x47,0x00,0x01,0x00,0x8b,0x02,0x02,0x01,0x08,0x02, + 0x10,0x01,0x28,0x32,0x01,0x03,0x00,0x43,0x02,0x01,0x00,0x3c,0x02,0x00,0x00,0x27, + 0x02,0x01,0x00,0x34,0x03,0x00,0x00,0x25,0x04,0x01,0x00,0x43,0x05,0x01,0x00,0x3d, + 0x03,0x01,0x02,0x27,0x04,0x01,0x00,0x49,0x02,0x05,0x80,0x34,0x06,0x02,0x00,0x36, + 0x07,0x05,0x01,0x3e,0x06,0x02,0x02,0x39,0x06,0x05,0x01,0x4b,0x02,0xfb,0x7f,0x34, + 0x02,0x03,0x00,0x37,0x02,0x04,0x02,0x10,0x03,0x01,0x00,0x3e,0x02,0x02,0x02,0x10, + 0x03,0x02,0x00,0x37,0x02,0x05,0x02,0x25,0x04,0x06,0x00,0x25,0x05,0x07,0x00,0x3e, + 0x02,0x04,0x02,0x10,0x01,0x02,0x00,0x2b,0x02,0x00,0x00,0x37,0x02,0x08,0x02,0x37, + 0x03,0x09,0x00,0x33,0x04,0x0a,0x00,0x33,0x05,0x0c,0x00,0x37,0x06,0x0b,0x00,0x3a, + 0x06,0x0d,0x05,0x3a,0x05,0x0e,0x04,0x2b,0x05,0x01,0x00,0x37,0x05,0x0f,0x05,0x10, + 0x06,0x01,0x00,0x3e,0x05,0x02,0x00,0x3c,0x05,0x00,0x00,0x3e,0x02,0x03,0x01,0x47, + 0x00,0x01,0x00,0x05,0xc0,0x03,0xc0,0x08,0x62,0x36,0x34,0x09,0x61,0x74,0x74,0x72, + 0x09,0x74,0x79,0x70,0x65,0x01,0x00,0x00,0x09,0x6d,0x6f,0x64,0x65,0x01,0x00,0x01, + 0x08,0x74,0x61,0x67,0x0b,0x73,0x74,0x72,0x65,0x61,0x6d,0x08,0x73,0x6b,0x74,0x0d, + 0x73,0x65,0x6e,0x64,0x5f,0x78,0x6d,0x6c,0x07,0x0d,0x0a,0x06,0x0a,0x09,0x67,0x73, + 0x75,0x62,0x0b,0x63,0x6f,0x6e,0x63,0x61,0x74,0x0a,0x74,0x61,0x62,0x6c,0x65,0x0d, + 0x74,0x6f,0x73,0x74,0x72,0x69,0x6e,0x67,0x06,0x23,0x0b,0x73,0x65,0x6c,0x65,0x63, + 0x74,0x03,0x80,0x80,0xc0,0x99,0x04,0x68,0x02,0x01,0x04,0x01,0x05,0x00,0x0f,0x2b, + 0x01,0x00,0x00,0x37,0x01,0x00,0x01,0x37,0x01,0x01,0x01,0x10,0x02,0x00,0x00,0x43, + 0x03,0x01,0x00,0x3d,0x01,0x01,0x01,0x34,0x01,0x02,0x00,0x37,0x01,0x03,0x01,0x37, + 0x02,0x04,0x00,0x36,0x01,0x02,0x01,0x10,0x02,0x01,0x00,0x37,0x01,0x01,0x01,0x43, + 0x03,0x01,0x00,0x3d,0x01,0x01,0x01,0x47,0x00,0x01,0x00,0x02,0xc0,0x09,0x6d,0x6f, + 0x64,0x65,0x09,0x62,0x61,0x73,0x65,0x07,0x69,0x6f,0x0a,0x77,0x72,0x69,0x74,0x65, + 0x14,0x72,0x65,0x64,0x69,0x72,0x65,0x63,0x74,0x5f,0x6f,0x75,0x74,0x70,0x75,0x74, + 0x25,0x02,0x01,0x04,0x00,0x02,0x00,0x05,0x37,0x01,0x00,0x00,0x10,0x02,0x01,0x00, + 0x37,0x01,0x01,0x01,0x43,0x03,0x01,0x00,0x3f,0x01,0x01,0x00,0x0a,0x66,0x6c,0x75, + 0x73,0x68,0x08,0x6f,0x75,0x74,0x25,0x02,0x01,0x04,0x00,0x02,0x00,0x05,0x37,0x01, 0x00,0x00,0x10,0x02,0x01,0x00,0x37,0x01,0x01,0x01,0x43,0x03,0x01,0x00,0x3f,0x01, - 0x01,0x00,0x09,0x73,0x65,0x65,0x6b,0x08,0x6f,0x75,0x74,0x1f,0x00,0x02,0x03,0x00, - 0x00,0x00,0x06,0x02,0x01,0x00,0x00,0x54,0x02,0x02,0x80,0x29,0x02,0x01,0x00,0x54, - 0x03,0x01,0x80,0x29,0x02,0x02,0x00,0x48,0x02,0x02,0x00,0x1f,0x00,0x02,0x03,0x00, - 0x00,0x00,0x06,0x04,0x00,0x01,0x00,0x54,0x02,0x02,0x80,0x29,0x02,0x01,0x00,0x54, - 0x03,0x01,0x80,0x29,0x02,0x02,0x00,0x48,0x02,0x02,0x00,0x24,0x00,0x02,0x03,0x00, - 0x00,0x01,0x07,0x22,0x02,0x01,0x00,0x08,0x02,0x00,0x00,0x54,0x02,0x02,0x80,0x29, - 0x02,0x01,0x00,0x54,0x03,0x01,0x80,0x29,0x02,0x02,0x00,0x48,0x02,0x02,0x00,0x00, - 0x92,0x02,0x00,0x01,0x08,0x05,0x0b,0x01,0x2c,0x2b,0x01,0x00,0x00,0x14,0x02,0x00, - 0x01,0x2c,0x00,0x02,0x00,0x3a,0x01,0x00,0x00,0x2b,0x02,0x01,0x00,0x37,0x02,0x01, - 0x02,0x37,0x03,0x02,0x00,0x3e,0x02,0x02,0x02,0x2b,0x03,0x01,0x00,0x37,0x03,0x03, - 0x03,0x33,0x04,0x05,0x00,0x37,0x05,0x04,0x02,0x3a,0x05,0x04,0x04,0x2b,0x05,0x02, - 0x00,0x37,0x05,0x06,0x05,0x37,0x06,0x07,0x02,0x3e,0x05,0x02,0x02,0x3a,0x05,0x07, - 0x04,0x3e,0x03,0x02,0x02,0x3a,0x03,0x02,0x00,0x2b,0x03,0x03,0x00,0x37,0x04,0x02, - 0x00,0x36,0x03,0x04,0x03,0x0e,0x00,0x03,0x00,0x54,0x04,0x04,0x80,0x32,0x03,0x00, - 0x00,0x2b,0x04,0x03,0x00,0x37,0x05,0x02,0x00,0x39,0x03,0x05,0x04,0x37,0x04,0x08, - 0x00,0x36,0x04,0x04,0x03,0x0e,0x00,0x04,0x00,0x54,0x05,0x03,0x80,0x32,0x04,0x00, - 0x00,0x37,0x05,0x08,0x00,0x39,0x04,0x05,0x03,0x34,0x05,0x09,0x00,0x37,0x05,0x0a, - 0x05,0x10,0x06,0x04,0x00,0x10,0x07,0x00,0x00,0x3e,0x05,0x03,0x01,0x2b,0x05,0x04, - 0x00,0x39,0x00,0x01,0x05,0x48,0x01,0x02,0x00,0x1a,0x80,0x08,0xc0,0x04,0xc0,0x16, - 0xc0,0x17,0xc0,0x0b,0x69,0x6e,0x73,0x65,0x72,0x74,0x0a,0x74,0x61,0x62,0x6c,0x65, - 0x0b,0x6c,0x69,0x6e,0x65,0x6e,0x6f,0x09,0x70,0x61,0x74,0x68,0x0e,0x6e,0x6f,0x72, - 0x6d,0x61,0x6c,0x69,0x7a,0x65,0x01,0x00,0x01,0x0e,0x61,0x75,0x74,0x68,0x6f,0x72, - 0x69,0x74,0x79,0x05,0x0b,0x73,0x63,0x68,0x65,0x6d,0x65,0x0a,0x62,0x75,0x69,0x6c, - 0x64,0x0d,0x66,0x69,0x6c,0x65,0x6e,0x61,0x6d,0x65,0x0a,0x70,0x61,0x72,0x73,0x65, - 0x07,0x69,0x64,0x02,0x91,0x05,0x00,0x02,0x14,0x06,0x17,0x01,0x69,0x10,0x03,0x00, - 0x00,0x37,0x02,0x00,0x00,0x25,0x04,0x01,0x00,0x13,0x04,0x04,0x00,0x14,0x04,0x00, - 0x04,0x3e,0x02,0x03,0x02,0x34,0x03,0x02,0x00,0x2b,0x04,0x00,0x00,0x3e,0x03,0x02, - 0x04,0x44,0x06,0x0c,0x80,0x10,0x09,0x06,0x00,0x37,0x08,0x03,0x06,0x10,0x0a,0x02, - 0x00,0x3e,0x08,0x03,0x03,0x35,0x09,0x04,0x00,0x35,0x08,0x05,0x00,0x34,0x08,0x04, - 0x00,0x13,0x09,0x06,0x00,0x05,0x08,0x09,0x00,0x54,0x08,0x02,0x80,0x10,0x00,0x06, - 0x00,0x54,0x03,0x02,0x80,0x42,0x06,0x03,0x03,0x4e,0x06,0xf2,0x7f,0x2b,0x03,0x00, - 0x00,0x36,0x03,0x00,0x03,0x0f,0x00,0x03,0x00,0x54,0x04,0x03,0x80,0x2b,0x03,0x00, - 0x00,0x36,0x03,0x00,0x03,0x36,0x03,0x01,0x03,0x0e,0x00,0x03,0x00,0x54,0x04,0x02, - 0x80,0x29,0x04,0x00,0x00,0x48,0x04,0x02,0x00,0x29,0x04,0x01,0x00,0x34,0x05,0x02, - 0x00,0x10,0x06,0x03,0x00,0x3e,0x05,0x02,0x04,0x44,0x08,0x3e,0x80,0x37,0x0a,0x06, - 0x09,0x07,0x0a,0x07,0x00,0x54,0x0a,0x3b,0x80,0x29,0x0a,0x02,0x00,0x37,0x0b,0x08, - 0x09,0x0f,0x00,0x0b,0x00,0x54,0x0c,0x1f,0x80,0x2b,0x0b,0x01,0x00,0x37,0x0b,0x09, - 0x0b,0x10,0x0c,0x0b,0x00,0x37,0x0b,0x0a,0x0b,0x2b,0x0d,0x02,0x00,0x37,0x0d,0x0b, - 0x0d,0x27,0x0e,0x00,0x00,0x3e,0x0b,0x04,0x02,0x2b,0x0c,0x03,0x00,0x37,0x0d,0x08, - 0x09,0x10,0x0e,0x0b,0x00,0x3e,0x0c,0x03,0x01,0x34,0x0c,0x0c,0x00,0x37,0x0d,0x08, - 0x09,0x3e,0x0c,0x02,0x03,0x0e,0x00,0x0c,0x00,0x54,0x0e,0x07,0x80,0x2b,0x0e,0x04, - 0x00,0x25,0x0f,0x0d,0x00,0x25,0x10,0x0e,0x00,0x10,0x11,0x00,0x00,0x10,0x12,0x01, - 0x00,0x10,0x13,0x0d,0x00,0x3e,0x0e,0x06,0x01,0x0f,0x00,0x0c,0x00,0x54,0x0e,0x04, - 0x80,0x10,0x0a,0x0d,0x00,0x54,0x0e,0x03,0x80,0x29,0x0a,0x01,0x00,0x54,0x0e,0x01, - 0x80,0x29,0x0a,0x02,0x00,0x0f,0x00,0x0a,0x00,0x54,0x0b,0x16,0x80,0x37,0x0b,0x0f, - 0x09,0x14,0x0b,0x00,0x0b,0x3a,0x0b,0x0f,0x09,0x2b,0x0b,0x05,0x00,0x37,0x0b,0x10, - 0x0b,0x37,0x0b,0x11,0x0b,0x37,0x0c,0x12,0x09,0x36,0x0b,0x0c,0x0b,0x37,0x0c,0x0f, - 0x09,0x37,0x0d,0x13,0x09,0x3e,0x0b,0x03,0x02,0x0f,0x00,0x0b,0x00,0x54,0x0c,0x09, - 0x80,0x37,0x0b,0x14,0x09,0x0f,0x00,0x0b,0x00,0x54,0x0c,0x05,0x80,0x2b,0x0b,0x05, - 0x00,0x37,0x0b,0x10,0x0b,0x37,0x0b,0x15,0x0b,0x37,0x0c,0x16,0x09,0x3e,0x0b,0x02, - 0x01,0x29,0x04,0x02,0x00,0x42,0x08,0x03,0x03,0x4e,0x08,0xc0,0x7f,0x48,0x04,0x02, - 0x00,0x16,0xc0,0x07,0xc0,0x12,0x80,0x13,0x80,0x09,0xc0,0x02,0xc0,0x07,0x69,0x64, - 0x0b,0x72,0x65,0x6d,0x6f,0x76,0x65,0x0e,0x74,0x65,0x6d,0x70,0x6f,0x72,0x61,0x72, - 0x79,0x0e,0x68,0x69,0x74,0x5f,0x76,0x61,0x6c,0x75,0x65,0x12,0x68,0x69,0x74,0x5f, - 0x63,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x13,0x68,0x69,0x74,0x5f,0x63,0x6f, - 0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x73,0x10,0x62,0x72,0x65,0x61,0x6b,0x70,0x6f, - 0x69,0x6e,0x74,0x73,0x0e,0x68,0x69,0x74,0x5f,0x63,0x6f,0x75,0x6e,0x74,0x3c,0x43, - 0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x20,0x65,0x76,0x61,0x6c,0x75,0x61,0x74, - 0x69,0x6f,0x6e,0x20,0x66,0x61,0x69,0x6c,0x65,0x64,0x20,0x66,0x6f,0x72,0x20,0x62, - 0x72,0x65,0x61,0x6b,0x70,0x6f,0x69,0x6e,0x74,0x20,0x61,0x74,0x20,0x25,0x73,0x3a, - 0x25,0x64,0x3a,0x20,0x25,0x73,0x0a,0x45,0x52,0x52,0x4f,0x52,0x0a,0x70,0x63,0x61, - 0x6c,0x6c,0x09,0x63,0x6f,0x72,0x6f,0x08,0x6e,0x65,0x77,0x0c,0x43,0x6f,0x6e,0x74, - 0x65,0x78,0x74,0x0e,0x63,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x0c,0x65,0x6e, - 0x61,0x62,0x6c,0x65,0x64,0x0a,0x73,0x74,0x61,0x74,0x65,0x06,0x69,0x06,0x6a,0x09, - 0x66,0x69,0x6e,0x64,0x0a,0x70,0x61,0x69,0x72,0x73,0x0c,0x66,0x69,0x6c,0x65,0x3a, - 0x2f,0x2f,0x08,0x73,0x75,0x62,0x02,0x2d,0x00,0x01,0x02,0x01,0x00,0x00,0x09,0x0f, - 0x00,0x00,0x00,0x54,0x01,0x04,0x80,0x2b,0x01,0x00,0x00,0x36,0x01,0x00,0x01,0x48, - 0x01,0x02,0x00,0x54,0x01,0x02,0x80,0x2b,0x01,0x00,0x00,0x48,0x01,0x02,0x00,0x47, - 0x00,0x01,0x00,0x17,0xc0,0xfd,0x01,0x00,0x01,0x0a,0x02,0x05,0x00,0x34,0x2b,0x01, - 0x00,0x00,0x36,0x01,0x00,0x01,0x0f,0x00,0x01,0x00,0x54,0x02,0x2e,0x80,0x2b,0x02, - 0x00,0x00,0x29,0x03,0x00,0x00,0x39,0x03,0x00,0x02,0x2b,0x02,0x01,0x00,0x37,0x03, - 0x00,0x01,0x36,0x02,0x03,0x02,0x37,0x03,0x01,0x01,0x36,0x02,0x03,0x02,0x27,0x03, - 0x01,0x00,0x13,0x04,0x02,0x00,0x27,0x05,0x01,0x00,0x49,0x03,0x0a,0x80,0x36,0x07, - 0x06,0x02,0x05,0x07,0x01,0x00,0x54,0x07,0x06,0x80,0x34,0x07,0x02,0x00,0x37,0x07, - 0x03,0x07,0x10,0x08,0x02,0x00,0x10,0x09,0x06,0x00,0x3e,0x07,0x03,0x01,0x54,0x03, - 0x01,0x80,0x4b,0x03,0xf6,0x7f,0x34,0x03,0x04,0x00,0x10,0x04,0x02,0x00,0x3e,0x03, - 0x02,0x02,0x0e,0x00,0x03,0x00,0x54,0x03,0x06,0x80,0x2b,0x03,0x01,0x00,0x37,0x04, - 0x00,0x01,0x36,0x03,0x04,0x03,0x37,0x04,0x01,0x01,0x29,0x05,0x00,0x00,0x39,0x05, - 0x04,0x03,0x34,0x03,0x04,0x00,0x2b,0x04,0x01,0x00,0x37,0x05,0x00,0x01,0x36,0x04, - 0x05,0x04,0x3e,0x03,0x02,0x02,0x0e,0x00,0x03,0x00,0x54,0x03,0x04,0x80,0x2b,0x03, - 0x01,0x00,0x37,0x04,0x00,0x01,0x29,0x05,0x00,0x00,0x39,0x05,0x04,0x03,0x29,0x03, - 0x02,0x00,0x48,0x03,0x02,0x00,0x29,0x02,0x01,0x00,0x48,0x02,0x02,0x00,0x17,0xc0, - 0x16,0xc0,0x09,0x6e,0x65,0x78,0x74,0x0b,0x72,0x65,0x6d,0x6f,0x76,0x65,0x0a,0x74, - 0x61,0x62,0x6c,0x65,0x0b,0x6c,0x69,0x6e,0x65,0x6e,0x6f,0x0d,0x66,0x69,0x6c,0x65, - 0x6e,0x61,0x6d,0x65,0x91,0x02,0x00,0x01,0x09,0x01,0x09,0x00,0x27,0x2b,0x01,0x00, - 0x00,0x36,0x01,0x00,0x01,0x0e,0x00,0x01,0x00,0x54,0x02,0x07,0x80,0x29,0x02,0x00, - 0x00,0x25,0x03,0x00,0x00,0x34,0x04,0x01,0x00,0x10,0x05,0x00,0x00,0x3e,0x04,0x02, - 0x02,0x24,0x03,0x04,0x03,0x46,0x02,0x03,0x00,0x33,0x02,0x02,0x00,0x32,0x03,0x00, - 0x00,0x3a,0x03,0x03,0x02,0x34,0x03,0x04,0x00,0x10,0x04,0x01,0x00,0x3e,0x03,0x02, - 0x04,0x44,0x06,0x02,0x80,0x37,0x08,0x03,0x02,0x39,0x07,0x06,0x08,0x42,0x06,0x03, - 0x03,0x4e,0x06,0xfc,0x7f,0x37,0x03,0x05,0x01,0x0f,0x00,0x03,0x00,0x54,0x04,0x04, - 0x80,0x33,0x03,0x06,0x00,0x37,0x04,0x05,0x01,0x3b,0x04,0x01,0x03,0x3b,0x03,0x01, - 0x02,0x37,0x03,0x03,0x02,0x29,0x04,0x00,0x00,0x3a,0x04,0x05,0x03,0x37,0x03,0x03, - 0x02,0x29,0x04,0x00,0x00,0x3a,0x04,0x07,0x03,0x37,0x03,0x03,0x02,0x29,0x04,0x00, - 0x00,0x3a,0x04,0x08,0x03,0x48,0x02,0x02,0x00,0x17,0xc0,0x0e,0x74,0x65,0x6d,0x70, - 0x6f,0x72,0x61,0x72,0x79,0x0e,0x63,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x01, - 0x00,0x01,0x08,0x74,0x61,0x67,0x0f,0x65,0x78,0x70,0x72,0x65,0x73,0x73,0x69,0x6f, - 0x6e,0x0f,0x65,0x78,0x70,0x72,0x65,0x73,0x73,0x69,0x6f,0x6e,0x0a,0x70,0x61,0x69, - 0x72,0x73,0x09,0x61,0x74,0x74,0x72,0x01,0x00,0x01,0x08,0x74,0x61,0x67,0x0f,0x62, - 0x72,0x65,0x61,0x6b,0x70,0x6f,0x69,0x6e,0x74,0x0d,0x74,0x6f,0x73,0x74,0x72,0x69, - 0x6e,0x67,0x19,0x4e,0x6f,0x20,0x73,0x75,0x63,0x68,0x20,0x62,0x72,0x65,0x61,0x6b, - 0x70,0x6f,0x69,0x6e,0x74,0x3a,0x20,0xae,0x01,0x00,0x01,0x08,0x05,0x05,0x00,0x19, - 0x2b,0x01,0x00,0x00,0x37,0x01,0x00,0x01,0x38,0x01,0x01,0x01,0x2b,0x02,0x01,0x00, - 0x25,0x03,0x01,0x00,0x25,0x04,0x02,0x00,0x10,0x05,0x00,0x00,0x34,0x06,0x03,0x00, - 0x10,0x07,0x01,0x00,0x3e,0x06,0x02,0x02,0x2b,0x07,0x02,0x00,0x36,0x07,0x01,0x07, - 0x3e,0x02,0x06,0x01,0x07,0x00,0x04,0x00,0x54,0x02,0x02,0x80,0x2f,0x03,0x02,0x00, - 0x54,0x02,0x07,0x80,0x2b,0x02,0x04,0x00,0x32,0x03,0x03,0x00,0x3b,0x00,0x01,0x03, - 0x2b,0x04,0x02,0x00,0x36,0x04,0x01,0x04,0x3b,0x04,0x02,0x03,0x39,0x03,0x01,0x02, - 0x47,0x00,0x01,0x00,0x12,0x80,0x09,0xc0,0x15,0xc0,0x19,0x80,0x18,0xc0,0x09,0x69, - 0x6e,0x74,0x6f,0x0d,0x74,0x6f,0x73,0x74,0x72,0x69,0x6e,0x67,0x24,0x52,0x65,0x67, - 0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x20,0x25,0x73,0x20,0x65,0x76,0x65,0x6e,0x74, - 0x20,0x66,0x6f,0x72,0x20,0x25,0x73,0x20,0x28,0x25,0x64,0x29,0x0a,0x44,0x45,0x42, - 0x55,0x47,0x09,0x63,0x6f,0x72,0x6f,0xc6,0x01,0x00,0x00,0x09,0x05,0x06,0x00,0x22, - 0x2b,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x54,0x01,0x02,0x80,0x29,0x00,0x02,0x00, - 0x48,0x00,0x02,0x00,0x2b,0x00,0x01,0x00,0x37,0x00,0x00,0x00,0x38,0x00,0x01,0x00, - 0x2b,0x01,0x02,0x00,0x36,0x01,0x00,0x01,0x0f,0x00,0x01,0x00,0x54,0x02,0x14,0x80, - 0x34,0x02,0x01,0x00,0x10,0x03,0x01,0x00,0x3e,0x02,0x02,0x03,0x2b,0x04,0x03,0x00, - 0x36,0x04,0x00,0x04,0x07,0x02,0x02,0x00,0x54,0x05,0x02,0x80,0x02,0x04,0x03,0x00, - 0x54,0x05,0x04,0x80,0x07,0x02,0x03,0x00,0x54,0x05,0x09,0x80,0x01,0x04,0x03,0x00, - 0x54,0x05,0x07,0x80,0x2b,0x05,0x04,0x00,0x25,0x06,0x04,0x00,0x25,0x07,0x05,0x00, - 0x10,0x08,0x02,0x00,0x3e,0x05,0x04,0x01,0x29,0x05,0x02,0x00,0x48,0x05,0x02,0x00, - 0x29,0x02,0x01,0x00,0x48,0x02,0x02,0x00,0x19,0x80,0x12,0x80,0x18,0xc0,0x15,0xc0, - 0x09,0xc0,0x16,0x45,0x76,0x65,0x6e,0x74,0x20,0x25,0x73,0x20,0x6d,0x61,0x74,0x63, - 0x68,0x65,0x64,0x21,0x0a,0x44,0x45,0x42,0x55,0x47,0x08,0x6f,0x75,0x74,0x09,0x6f, - 0x76,0x65,0x72,0x0b,0x75,0x6e,0x70,0x61,0x63,0x6b,0x09,0x63,0x6f,0x72,0x6f,0x32, - 0x00,0x00,0x03,0x03,0x01,0x00,0x08,0x2b,0x00,0x00,0x00,0x2b,0x01,0x01,0x00,0x37, - 0x01,0x00,0x01,0x38,0x01,0x01,0x01,0x29,0x02,0x00,0x00,0x39,0x02,0x01,0x00,0x2f, - 0x02,0x00,0x00,0x47,0x00,0x01,0x00,0x18,0xc0,0x12,0x80,0x19,0x80,0x09,0x63,0x6f, - 0x72,0x6f,0x9b,0x01,0x00,0x02,0x06,0x01,0x09,0x00,0x12,0x37,0x02,0x00,0x00,0x37, - 0x03,0x02,0x00,0x3a,0x03,0x01,0x02,0x37,0x02,0x00,0x00,0x0c,0x03,0x01,0x00,0x54, - 0x03,0x01,0x80,0x25,0x03,0x04,0x00,0x3a,0x03,0x03,0x02,0x2b,0x02,0x00,0x00,0x37, - 0x02,0x05,0x02,0x37,0x03,0x06,0x00,0x33,0x04,0x07,0x00,0x37,0x05,0x00,0x00,0x3a, - 0x05,0x08,0x04,0x3e,0x02,0x03,0x01,0x29,0x02,0x00,0x00,0x3a,0x02,0x00,0x00,0x47, - 0x00,0x01,0x00,0x05,0xc0,0x09,0x61,0x74,0x74,0x72,0x01,0x00,0x01,0x08,0x74,0x61, - 0x67,0x0d,0x72,0x65,0x73,0x70,0x6f,0x6e,0x73,0x65,0x08,0x73,0x6b,0x74,0x0d,0x73, - 0x65,0x6e,0x64,0x5f,0x78,0x6d,0x6c,0x07,0x6f,0x6b,0x0b,0x72,0x65,0x61,0x73,0x6f, - 0x6e,0x0a,0x73,0x74,0x61,0x74,0x65,0x0b,0x73,0x74,0x61,0x74,0x75,0x73,0x15,0x70, - 0x72,0x65,0x76,0x69,0x6f,0x75,0x73,0x5f,0x63,0x6f,0x6e,0x74,0x65,0x78,0x74,0xcf, - 0x01,0x00,0x00,0x07,0x04,0x08,0x00,0x1e,0x34,0x00,0x00,0x00,0x34,0x01,0x00,0x00, - 0x2b,0x02,0x00,0x00,0x2b,0x03,0x01,0x00,0x3a,0x03,0x02,0x01,0x3a,0x02,0x01,0x00, - 0x34,0x00,0x03,0x00,0x2b,0x01,0x02,0x00,0x37,0x01,0x04,0x01,0x37,0x01,0x05,0x01, - 0x3e,0x00,0x02,0x04,0x44,0x03,0x04,0x80,0x2b,0x05,0x03,0x00,0x37,0x05,0x06,0x05, - 0x10,0x06,0x04,0x00,0x3e,0x05,0x02,0x01,0x42,0x03,0x03,0x03,0x4e,0x03,0xfa,0x7f, - 0x2b,0x00,0x03,0x00,0x37,0x00,0x06,0x00,0x3e,0x00,0x01,0x01,0x2b,0x00,0x02,0x00, - 0x37,0x00,0x04,0x00,0x2b,0x01,0x02,0x00,0x37,0x01,0x04,0x01,0x32,0x02,0x00,0x00, - 0x32,0x03,0x00,0x00,0x3a,0x03,0x07,0x01,0x3a,0x02,0x05,0x00,0x47,0x00,0x01,0x00, - 0x0e,0xc0,0x0c,0xc0,0x02,0xc0,0x01,0xc0,0x0e,0x66,0x72,0x6f,0x6d,0x5f,0x63,0x6f, - 0x72,0x6f,0x0c,0x73,0x65,0x74,0x68,0x6f,0x6f,0x6b,0x0c,0x66,0x72,0x6f,0x6d,0x5f, - 0x69,0x64,0x16,0x61,0x63,0x74,0x69,0x76,0x65,0x5f,0x63,0x6f,0x72,0x6f,0x75,0x74, - 0x69,0x6e,0x65,0x73,0x0a,0x70,0x61,0x69,0x72,0x73,0x09,0x77,0x72,0x61,0x70,0x0b, - 0x72,0x65,0x73,0x75,0x6d,0x65,0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65, - 0x23,0x00,0x00,0x04,0x04,0x00,0x00,0x05,0x2b,0x00,0x00,0x00,0x2b,0x01,0x01,0x00, - 0x2b,0x02,0x02,0x00,0x2b,0x03,0x03,0x00,0x40,0x00,0x04,0x00,0x07,0xc0,0x00,0xc0, - 0x05,0xc0,0x06,0xc0,0xb7,0x08,0x01,0x02,0x14,0x07,0x26,0x01,0xa5,0x01,0x37,0x02, - 0x00,0x00,0x10,0x03,0x02,0x00,0x37,0x02,0x01,0x02,0x29,0x04,0x00,0x00,0x3e,0x02, - 0x03,0x01,0x0b,0x01,0x00,0x00,0x54,0x02,0x02,0x80,0x29,0x02,0x01,0x00,0x54,0x03, - 0x01,0x80,0x29,0x02,0x02,0x00,0x37,0x03,0x02,0x00,0x0f,0x00,0x03,0x00,0x54,0x04, - 0x08,0x80,0x0e,0x00,0x02,0x00,0x54,0x03,0x06,0x80,0x25,0x03,0x04,0x00,0x3a,0x03, - 0x03,0x00,0x2b,0x03,0x00,0x00,0x37,0x03,0x05,0x03,0x10,0x04,0x00,0x00,0x3e,0x03, - 0x02,0x01,0x2b,0x03,0x01,0x00,0x37,0x03,0x07,0x03,0x37,0x04,0x08,0x00,0x3e,0x03, - 0x02,0x02,0x3a,0x03,0x06,0x00,0x51,0x03,0x7f,0x80,0x0c,0x03,0x01,0x00,0x54,0x03, - 0x04,0x80,0x2b,0x03,0x02,0x00,0x37,0x03,0x09,0x03,0x37,0x04,0x00,0x00,0x3e,0x03, - 0x02,0x02,0x0e,0x00,0x03,0x00,0x54,0x04,0x07,0x80,0x2b,0x04,0x03,0x00,0x25,0x05, - 0x0a,0x00,0x25,0x06,0x0b,0x00,0x3e,0x04,0x03,0x01,0x2b,0x04,0x04,0x00,0x3e,0x04, - 0x01,0x01,0x30,0x03,0x70,0x80,0x29,0x01,0x00,0x00,0x2b,0x04,0x03,0x00,0x25,0x05, - 0x0c,0x00,0x10,0x06,0x03,0x00,0x3e,0x04,0x03,0x01,0x2b,0x04,0x02,0x00,0x37,0x04, - 0x0d,0x04,0x10,0x05,0x03,0x00,0x3e,0x04,0x02,0x04,0x2b,0x07,0x05,0x00,0x36,0x07, - 0x04,0x07,0x0f,0x00,0x07,0x00,0x54,0x08,0x4e,0x80,0x34,0x08,0x0e,0x00,0x31,0x09, - 0x0f,0x00,0x2b,0x0a,0x06,0x00,0x37,0x0a,0x10,0x0a,0x3e,0x08,0x03,0x03,0x0e,0x00, - 0x08,0x00,0x54,0x0a,0x34,0x80,0x2a,0x0a,0x0c,0x00,0x34,0x0d,0x11,0x00,0x10,0x0e, - 0x09,0x00,0x3e,0x0d,0x02,0x02,0x07,0x0d,0x12,0x00,0x54,0x0d,0x0d,0x80,0x34,0x0d, - 0x13,0x00,0x10,0x0e,0x09,0x00,0x3e,0x0d,0x02,0x02,0x2b,0x0e,0x02,0x00,0x37,0x0e, - 0x14,0x0e,0x05,0x0d,0x0e,0x00,0x54,0x0d,0x06,0x80,0x37,0x0d,0x15,0x09,0x37,0x0e, - 0x16,0x09,0x37,0x0c,0x17,0x09,0x10,0x0b,0x0e,0x00,0x10,0x0a,0x0d,0x00,0x54,0x0d, - 0x07,0x80,0x27,0x0d,0xe6,0x03,0x34,0x0e,0x18,0x00,0x10,0x0f,0x09,0x00,0x3e,0x0e, - 0x02,0x02,0x32,0x0c,0x00,0x00,0x10,0x0b,0x0e,0x00,0x10,0x0a,0x0d,0x00,0x2b,0x0d, - 0x03,0x00,0x25,0x0e,0x19,0x00,0x25,0x0f,0x1a,0x00,0x10,0x10,0x04,0x00,0x10,0x11, - 0x0a,0x00,0x34,0x12,0x18,0x00,0x10,0x13,0x0b,0x00,0x3e,0x12,0x02,0x00,0x3d,0x0d, - 0x04,0x01,0x10,0x0d,0x04,0x00,0x37,0x0e,0x1d,0x05,0x3a,0x0e,0x1c,0x0c,0x3a,0x0d, - 0x1b,0x0c,0x2b,0x0d,0x02,0x00,0x37,0x0d,0x1e,0x0d,0x37,0x0e,0x00,0x00,0x33,0x0f, - 0x1f,0x00,0x3a,0x0c,0x17,0x0f,0x2b,0x10,0x02,0x00,0x37,0x10,0x20,0x10,0x10,0x11, - 0x0a,0x00,0x10,0x12,0x0b,0x00,0x3e,0x10,0x03,0x00,0x3c,0x10,0x00,0x00,0x3e,0x0d, - 0x03,0x01,0x54,0x0a,0x27,0x80,0x0f,0x00,0x09,0x00,0x54,0x0a,0x07,0x80,0x33,0x0a, - 0x21,0x00,0x3a,0x04,0x1b,0x0a,0x37,0x0b,0x1d,0x05,0x3a,0x0b,0x1c,0x0a,0x3a,0x0a, - 0x02,0x00,0x30,0x03,0x20,0x80,0x54,0x0a,0x1e,0x80,0x0b,0x09,0x00,0x00,0x54,0x0a, - 0x04,0x80,0x0f,0x00,0x02,0x00,0x54,0x0a,0x02,0x80,0x30,0x03,0x1a,0x80,0x54,0x0a, - 0x18,0x80,0x0b,0x09,0x01,0x00,0x54,0x0a,0x16,0x80,0x29,0x02,0x01,0x00,0x54,0x08, - 0x14,0x80,0x2b,0x08,0x03,0x00,0x25,0x09,0x22,0x00,0x10,0x0a,0x04,0x00,0x24,0x09, - 0x0a,0x09,0x3e,0x08,0x02,0x01,0x2b,0x08,0x02,0x00,0x37,0x08,0x1e,0x08,0x37,0x09, - 0x00,0x00,0x33,0x0a,0x23,0x00,0x33,0x0b,0x24,0x00,0x3a,0x04,0x1b,0x0b,0x37,0x0c, - 0x1d,0x05,0x3a,0x0c,0x1c,0x0b,0x3a,0x0b,0x17,0x0a,0x2b,0x0b,0x02,0x00,0x37,0x0b, - 0x20,0x0b,0x27,0x0c,0x04,0x00,0x3e,0x0b,0x02,0x00,0x3c,0x0b,0x00,0x00,0x3e,0x08, - 0x03,0x01,0x30,0x03,0x80,0x7f,0x29,0x03,0x00,0x00,0x3a,0x03,0x06,0x00,0x25,0x03, - 0x25,0x00,0x3a,0x03,0x03,0x00,0x37,0x03,0x00,0x00,0x10,0x04,0x03,0x00,0x37,0x03, - 0x01,0x03,0x27,0x05,0x00,0x00,0x3e,0x03,0x03,0x01,0x30,0x00,0x00,0x80,0x47,0x00, - 0x01,0x00,0x02,0xc0,0x07,0xc0,0x05,0xc0,0x09,0xc0,0x16,0xc0,0x06,0xc0,0x01,0xc0, - 0x0c,0x72,0x75,0x6e,0x6e,0x69,0x6e,0x67,0x01,0x00,0x00,0x01,0x00,0x01,0x08,0x74, - 0x61,0x67,0x0d,0x72,0x65,0x73,0x70,0x6f,0x6e,0x73,0x65,0x1a,0x47,0x6f,0x74,0x20, - 0x75,0x6e,0x6b,0x6e,0x6f,0x77,0x6e,0x20,0x63,0x6f,0x6d,0x6d,0x61,0x6e,0x64,0x3a, - 0x20,0x01,0x00,0x00,0x0f,0x6d,0x61,0x6b,0x65,0x5f,0x65,0x72,0x72,0x6f,0x72,0x01, - 0x00,0x01,0x08,0x74,0x61,0x67,0x0d,0x72,0x65,0x73,0x70,0x6f,0x6e,0x73,0x65,0x0d, - 0x73,0x65,0x6e,0x64,0x5f,0x78,0x6d,0x6c,0x06,0x69,0x13,0x74,0x72,0x61,0x6e,0x73, - 0x61,0x63,0x74,0x69,0x6f,0x6e,0x5f,0x69,0x64,0x0c,0x63,0x6f,0x6d,0x6d,0x61,0x6e, - 0x64,0x1f,0x43,0x6f,0x6d,0x6d,0x61,0x6e,0x64,0x20,0x25,0x73,0x20,0x63,0x61,0x75, - 0x73,0x65,0x64,0x3a,0x20,0x28,0x25,0x64,0x29,0x20,0x25,0x73,0x0a,0x45,0x52,0x52, - 0x4f,0x52,0x0d,0x74,0x6f,0x73,0x74,0x72,0x69,0x6e,0x67,0x09,0x61,0x74,0x74,0x72, - 0x0c,0x6d,0x65,0x73,0x73,0x61,0x67,0x65,0x09,0x63,0x6f,0x64,0x65,0x17,0x44,0x42, - 0x47,0x50,0x5f,0x45,0x52,0x52,0x5f,0x4d,0x45,0x54,0x41,0x54,0x41,0x42,0x4c,0x45, - 0x11,0x67,0x65,0x74,0x6d,0x65,0x74,0x61,0x74,0x61,0x62,0x6c,0x65,0x0a,0x74,0x61, - 0x62,0x6c,0x65,0x09,0x74,0x79,0x70,0x65,0x0e,0x74,0x72,0x61,0x63,0x65,0x62,0x61, - 0x63,0x6b,0x00,0x0b,0x78,0x70,0x63,0x61,0x6c,0x6c,0x0e,0x63,0x6d,0x64,0x5f,0x70, - 0x61,0x72,0x73,0x65,0x0a,0x44,0x45,0x42,0x55,0x47,0x1d,0x6c,0x6f,0x73,0x74,0x20, - 0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x20,0x63,0x6f,0x6e,0x6e,0x65,0x63,0x74, - 0x69,0x6f,0x6e,0x0c,0x57,0x41,0x52,0x4e,0x49,0x4e,0x47,0x10,0x72,0x65,0x61,0x64, - 0x5f,0x70,0x61,0x63,0x6b,0x65,0x74,0x09,0x63,0x6f,0x72,0x6f,0x13,0x43,0x6f,0x6e, - 0x74,0x65,0x78,0x74,0x4d,0x61,0x6e,0x61,0x67,0x65,0x72,0x0a,0x73,0x74,0x61,0x63, - 0x6b,0x1e,0x70,0x72,0x65,0x76,0x69,0x6f,0x75,0x73,0x5f,0x63,0x6f,0x6e,0x74,0x65, - 0x78,0x74,0x5f,0x72,0x65,0x73,0x70,0x6f,0x6e,0x73,0x65,0x0a,0x62,0x72,0x65,0x61, - 0x6b,0x0a,0x73,0x74,0x61,0x74,0x65,0x15,0x70,0x72,0x65,0x76,0x69,0x6f,0x75,0x73, - 0x5f,0x63,0x6f,0x6e,0x74,0x65,0x78,0x74,0x0f,0x73,0x65,0x74,0x74,0x69,0x6d,0x65, - 0x6f,0x75,0x74,0x08,0x73,0x6b,0x74,0x03,0x80,0x80,0xc0,0x99,0x04,0x9b,0x03,0x00, - 0x01,0x0b,0x08,0x0f,0x00,0x42,0x2a,0x01,0x02,0x00,0x2b,0x03,0x00,0x00,0x37,0x03, - 0x00,0x03,0x10,0x04,0x03,0x00,0x37,0x03,0x01,0x03,0x27,0x05,0x00,0x00,0x25,0x06, - 0x02,0x00,0x3e,0x03,0x04,0x02,0x2b,0x04,0x01,0x00,0x37,0x04,0x03,0x04,0x37,0x05, - 0x04,0x03,0x3e,0x04,0x02,0x02,0x0f,0x00,0x04,0x00,0x54,0x05,0x24,0x80,0x2b,0x05, - 0x02,0x00,0x04,0x04,0x05,0x00,0x54,0x05,0x21,0x80,0x2b,0x05,0x03,0x00,0x04,0x04, - 0x05,0x00,0x54,0x05,0x1e,0x80,0x2b,0x05,0x04,0x00,0x37,0x05,0x05,0x05,0x37,0x05, - 0x06,0x05,0x10,0x06,0x04,0x00,0x10,0x07,0x00,0x00,0x3e,0x05,0x03,0x02,0x0c,0x01, - 0x05,0x00,0x54,0x06,0x05,0x80,0x2b,0x05,0x04,0x00,0x37,0x05,0x07,0x05,0x37,0x05, - 0x08,0x05,0x3e,0x05,0x01,0x02,0x10,0x01,0x05,0x00,0x0f,0x00,0x01,0x00,0x54,0x05, - 0x04,0x80,0x2b,0x05,0x04,0x00,0x37,0x05,0x07,0x05,0x37,0x05,0x09,0x05,0x3e,0x05, - 0x01,0x01,0x0e,0x00,0x01,0x00,0x54,0x05,0x09,0x80,0x2b,0x05,0x05,0x00,0x37,0x05, - 0x0a,0x05,0x2b,0x06,0x00,0x00,0x37,0x06,0x0b,0x06,0x3e,0x05,0x02,0x02,0x10,0x02, - 0x05,0x00,0x0f,0x00,0x02,0x00,0x54,0x05,0x01,0x80,0x29,0x01,0x02,0x00,0x0f,0x00, - 0x01,0x00,0x54,0x05,0x0d,0x80,0x34,0x05,0x0c,0x00,0x2b,0x06,0x06,0x00,0x2b,0x07, - 0x00,0x00,0x10,0x08,0x02,0x00,0x3e,0x05,0x04,0x03,0x0e,0x00,0x05,0x00,0x54,0x07, - 0x06,0x80,0x2b,0x07,0x07,0x00,0x25,0x08,0x0d,0x00,0x25,0x09,0x0e,0x00,0x10,0x0a, - 0x06,0x00,0x24,0x09,0x0a,0x09,0x3e,0x07,0x03,0x01,0x47,0x00,0x01,0x00,0x12,0x80, - 0x04,0xc0,0x10,0x80,0x11,0x80,0x02,0xc0,0x05,0xc0,0x17,0xc0,0x09,0xc0,0x1d,0x45, - 0x72,0x72,0x6f,0x72,0x20,0x77,0x68,0x69,0x6c,0x65,0x20,0x64,0x65,0x62,0x75,0x67, - 0x20,0x6c,0x6f,0x6f,0x70,0x3a,0x20,0x0a,0x45,0x52,0x52,0x4f,0x52,0x0a,0x70,0x63, - 0x61,0x6c,0x6c,0x08,0x73,0x6b,0x74,0x10,0x72,0x65,0x61,0x64,0x5f,0x70,0x61,0x63, - 0x6b,0x65,0x74,0x0c,0x64,0x69,0x73,0x63,0x61,0x72,0x64,0x0f,0x64,0x6f,0x65,0x73, - 0x5f,0x6d,0x61,0x74,0x63,0x68,0x0b,0x65,0x76,0x65,0x6e,0x74,0x73,0x07,0x61,0x74, - 0x10,0x62,0x72,0x65,0x61,0x6b,0x70,0x6f,0x69,0x6e,0x74,0x73,0x0b,0x73,0x6f,0x75, - 0x72,0x63,0x65,0x0c,0x67,0x65,0x74,0x5f,0x75,0x72,0x69,0x06,0x53,0x0c,0x67,0x65, - 0x74,0x69,0x6e,0x66,0x6f,0x09,0x63,0x6f,0x72,0x6f,0x2f,0x00,0x01,0x03,0x02,0x00, - 0x00,0x09,0x51,0x01,0x07,0x80,0x2b,0x01,0x00,0x00,0x10,0x02,0x00,0x00,0x3e,0x01, - 0x02,0x01,0x2b,0x01,0x01,0x00,0x3e,0x01,0x01,0x02,0x10,0x00,0x01,0x00,0x54,0x01, - 0xf8,0x7f,0x47,0x00,0x01,0x00,0x18,0xc0,0x0d,0xc0,0xa7,0x02,0x00,0x02,0x07,0x07, - 0x08,0x01,0x34,0x2b,0x02,0x00,0x00,0x3e,0x02,0x01,0x02,0x0e,0x00,0x02,0x00,0x54, - 0x03,0x01,0x80,0x25,0x02,0x00,0x00,0x07,0x00,0x01,0x00,0x54,0x03,0x06,0x80,0x2b, - 0x03,0x01,0x00,0x2b,0x04,0x01,0x00,0x36,0x04,0x02,0x04,0x14,0x04,0x00,0x04,0x39, - 0x04,0x02,0x03,0x54,0x03,0x26,0x80,0x07,0x00,0x02,0x00,0x54,0x03,0x01,0x80,0x54, - 0x03,0x23,0x80,0x06,0x00,0x03,0x00,0x54,0x03,0x02,0x80,0x07,0x00,0x04,0x00,0x54, - 0x03,0x06,0x80,0x2b,0x03,0x01,0x00,0x2b,0x04,0x01,0x00,0x36,0x04,0x02,0x04,0x15, - 0x04,0x00,0x04,0x39,0x04,0x02,0x03,0x54,0x03,0x19,0x80,0x2b,0x03,0x02,0x00,0x2b, - 0x04,0x03,0x00,0x37,0x04,0x06,0x04,0x2b,0x05,0x00,0x00,0x3e,0x05,0x01,0x00,0x3d, - 0x04,0x00,0x02,0x3a,0x04,0x05,0x03,0x2b,0x03,0x02,0x00,0x37,0x03,0x05,0x03,0x38, - 0x03,0x01,0x03,0x07,0x03,0x00,0x00,0x54,0x03,0x04,0x80,0x2b,0x03,0x04,0x00,0x10, - 0x04,0x01,0x00,0x3e,0x03,0x02,0x01,0x54,0x03,0x06,0x80,0x34,0x03,0x07,0x00,0x2b, - 0x04,0x05,0x00,0x2b,0x05,0x06,0x00,0x10,0x06,0x01,0x00,0x3e,0x04,0x03,0x00,0x3d, - 0x03,0x00,0x01,0x2b,0x03,0x02,0x00,0x29,0x04,0x00,0x00,0x3a,0x04,0x05,0x03,0x47, - 0x00,0x01,0x00,0x0a,0xc0,0x15,0xc0,0x12,0x80,0x03,0xc0,0x18,0xc0,0x0e,0xc0,0x19, - 0xc0,0x0b,0x61,0x73,0x73,0x65,0x72,0x74,0x12,0x43,0x75,0x72,0x72,0x65,0x6e,0x74, - 0x54,0x68,0x72,0x65,0x61,0x64,0x09,0x63,0x6f,0x72,0x6f,0x10,0x74,0x61,0x69,0x6c, - 0x20,0x72,0x65,0x74,0x75,0x72,0x6e,0x0b,0x72,0x65,0x74,0x75,0x72,0x6e,0x0e,0x74, - 0x61,0x69,0x6c,0x20,0x63,0x61,0x6c,0x6c,0x09,0x63,0x61,0x6c,0x6c,0x09,0x6d,0x61, - 0x69,0x6e,0x02,0xfc,0x02,0x00,0x02,0x07,0x08,0x0d,0x02,0x45,0x2b,0x02,0x00,0x00, - 0x3e,0x02,0x01,0x02,0x0e,0x00,0x02,0x00,0x54,0x03,0x01,0x80,0x25,0x02,0x00,0x00, - 0x07,0x00,0x01,0x00,0x54,0x03,0x0f,0x80,0x2b,0x03,0x01,0x00,0x37,0x03,0x02,0x03, - 0x27,0x04,0x02,0x00,0x25,0x05,0x03,0x00,0x3e,0x03,0x03,0x02,0x37,0x03,0x04,0x03, - 0x07,0x03,0x05,0x00,0x54,0x03,0x01,0x80,0x47,0x00,0x01,0x00,0x2b,0x03,0x02,0x00, - 0x2b,0x04,0x02,0x00,0x36,0x04,0x02,0x04,0x14,0x04,0x00,0x04,0x39,0x04,0x02,0x03, - 0x54,0x03,0x2e,0x80,0x06,0x00,0x06,0x00,0x54,0x03,0x02,0x80,0x07,0x00,0x07,0x00, - 0x54,0x03,0x0f,0x80,0x27,0x03,0x02,0x00,0x2b,0x04,0x01,0x00,0x37,0x04,0x02,0x04, - 0x10,0x05,0x03,0x00,0x25,0x06,0x08,0x00,0x3e,0x04,0x03,0x02,0x0f,0x00,0x04,0x00, - 0x54,0x05,0x03,0x80,0x51,0x04,0x02,0x80,0x14,0x03,0x00,0x03,0x54,0x04,0xf6,0x7f, - 0x2b,0x04,0x02,0x00,0x15,0x05,0x01,0x03,0x39,0x05,0x02,0x04,0x54,0x03,0x1b,0x80, - 0x07,0x00,0x09,0x00,0x54,0x03,0x19,0x80,0x2b,0x03,0x03,0x00,0x2b,0x04,0x04,0x00, - 0x37,0x04,0x0b,0x04,0x2b,0x05,0x00,0x00,0x3e,0x05,0x01,0x00,0x3d,0x04,0x00,0x02, - 0x3a,0x04,0x0a,0x03,0x2b,0x03,0x03,0x00,0x37,0x03,0x0a,0x03,0x38,0x03,0x01,0x03, - 0x07,0x03,0x00,0x00,0x54,0x03,0x04,0x80,0x2b,0x03,0x05,0x00,0x10,0x04,0x01,0x00, - 0x3e,0x03,0x02,0x01,0x54,0x03,0x06,0x80,0x34,0x03,0x0c,0x00,0x2b,0x04,0x06,0x00, - 0x2b,0x05,0x07,0x00,0x10,0x06,0x01,0x00,0x3e,0x04,0x03,0x00,0x3d,0x03,0x00,0x01, - 0x2b,0x03,0x03,0x00,0x29,0x04,0x00,0x00,0x3a,0x04,0x0a,0x03,0x47,0x00,0x01,0x00, - 0x0a,0xc0,0x01,0xc0,0x15,0xc0,0x12,0x80,0x03,0xc0,0x18,0xc0,0x0e,0xc0,0x19,0xc0, - 0x0b,0x61,0x73,0x73,0x65,0x72,0x74,0x12,0x43,0x75,0x72,0x72,0x65,0x6e,0x74,0x54, - 0x68,0x72,0x65,0x61,0x64,0x09,0x63,0x6f,0x72,0x6f,0x09,0x6c,0x69,0x6e,0x65,0x06, - 0x66,0x10,0x74,0x61,0x69,0x6c,0x20,0x72,0x65,0x74,0x75,0x72,0x6e,0x0b,0x72,0x65, - 0x74,0x75,0x72,0x6e,0x06,0x43,0x09,0x77,0x68,0x61,0x74,0x06,0x53,0x0c,0x67,0x65, - 0x74,0x69,0x6e,0x66,0x6f,0x09,0x63,0x61,0x6c,0x6c,0x09,0x6d,0x61,0x69,0x6e,0x02, - 0x04,0x96,0x01,0x02,0x01,0x04,0x03,0x04,0x00,0x18,0x2b,0x01,0x00,0x00,0x10,0x02, - 0x00,0x00,0x3e,0x01,0x02,0x02,0x07,0x01,0x00,0x00,0x54,0x01,0x11,0x80,0x2b,0x01, - 0x01,0x00,0x37,0x01,0x01,0x01,0x37,0x01,0x02,0x01,0x36,0x01,0x00,0x01,0x2b,0x02, - 0x01,0x00,0x37,0x02,0x01,0x02,0x37,0x02,0x03,0x02,0x29,0x03,0x00,0x00,0x39,0x03, - 0x01,0x02,0x2b,0x02,0x01,0x00,0x37,0x02,0x01,0x02,0x37,0x02,0x02,0x02,0x29,0x03, - 0x00,0x00,0x39,0x03,0x00,0x02,0x2b,0x02,0x02,0x00,0x29,0x03,0x00,0x00,0x39,0x03, - 0x00,0x02,0x43,0x01,0x01,0x00,0x45,0x01,0x00,0x00,0x0c,0x00,0x0d,0x00,0x07,0x00, - 0x0c,0x66,0x72,0x6f,0x6d,0x5f,0x69,0x64,0x0e,0x66,0x72,0x6f,0x6d,0x5f,0x63,0x6f, - 0x72,0x6f,0x16,0x61,0x63,0x74,0x69,0x76,0x65,0x5f,0x63,0x6f,0x72,0x6f,0x75,0x74, - 0x69,0x6e,0x65,0x73,0x09,0x64,0x65,0x61,0x64,0xea,0x01,0x02,0x01,0x06,0x06,0x06, - 0x01,0x29,0x2b,0x01,0x00,0x00,0x36,0x01,0x00,0x01,0x0e,0x00,0x01,0x00,0x54,0x01, - 0x1e,0x80,0x2b,0x01,0x00,0x00,0x27,0x02,0x00,0x00,0x39,0x02,0x00,0x01,0x2b,0x01, - 0x01,0x00,0x37,0x01,0x00,0x01,0x2b,0x02,0x01,0x00,0x37,0x02,0x00,0x02,0x37,0x02, - 0x01,0x02,0x14,0x02,0x00,0x02,0x3a,0x02,0x01,0x01,0x2b,0x01,0x01,0x00,0x37,0x01, - 0x00,0x01,0x37,0x01,0x02,0x01,0x2b,0x02,0x01,0x00,0x37,0x02,0x00,0x02,0x37,0x02, - 0x01,0x02,0x39,0x00,0x02,0x01,0x2b,0x01,0x01,0x00,0x37,0x01,0x00,0x01,0x37,0x01, - 0x03,0x01,0x2b,0x02,0x01,0x00,0x37,0x02,0x00,0x02,0x37,0x02,0x01,0x02,0x39,0x02, - 0x00,0x01,0x2b,0x01,0x02,0x00,0x37,0x01,0x04,0x01,0x10,0x02,0x00,0x00,0x2b,0x03, - 0x03,0x00,0x25,0x04,0x05,0x00,0x3e,0x01,0x04,0x01,0x2b,0x01,0x04,0x00,0x10,0x02, - 0x00,0x00,0x2b,0x03,0x05,0x00,0x10,0x04,0x00,0x00,0x43,0x05,0x01,0x00,0x3d,0x03, - 0x01,0x00,0x3f,0x01,0x01,0x00,0x07,0x00,0x0d,0x00,0x04,0x00,0x0b,0x00,0x15,0xc0, - 0x0e,0x00,0x08,0x72,0x6c,0x63,0x0c,0x73,0x65,0x74,0x68,0x6f,0x6f,0x6b,0x0e,0x66, - 0x72,0x6f,0x6d,0x5f,0x63,0x6f,0x72,0x6f,0x0c,0x66,0x72,0x6f,0x6d,0x5f,0x69,0x64, - 0x06,0x6e,0x16,0x61,0x63,0x74,0x69,0x76,0x65,0x5f,0x63,0x6f,0x72,0x6f,0x75,0x74, - 0x69,0x6e,0x65,0x73,0x02,0x29,0x02,0x01,0x03,0x00,0x01,0x00,0x07,0x0e,0x00,0x00, - 0x00,0x54,0x01,0x03,0x80,0x34,0x01,0x00,0x00,0x43,0x02,0x01,0x02,0x3e,0x01,0x02, - 0x01,0x43,0x01,0x01,0x00,0x45,0x01,0x00,0x00,0x0a,0x65,0x72,0x72,0x6f,0x72,0x38, - 0x02,0x00,0x04,0x02,0x02,0x00,0x07,0x2b,0x00,0x00,0x00,0x34,0x01,0x00,0x00,0x37, - 0x01,0x01,0x01,0x2b,0x02,0x01,0x00,0x43,0x03,0x00,0x00,0x3d,0x01,0x01,0x00,0x3f, - 0x00,0x00,0x00,0x00,0x00,0x01,0xc0,0x0b,0x72,0x65,0x73,0x75,0x6d,0x65,0x0e,0x63, - 0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x37,0x01,0x01,0x03,0x01,0x03,0x00,0x07, - 0x34,0x01,0x00,0x00,0x37,0x01,0x01,0x01,0x10,0x02,0x00,0x00,0x3e,0x01,0x02,0x02, - 0x31,0x02,0x02,0x00,0x30,0x00,0x00,0x80,0x48,0x02,0x02,0x00,0x16,0xc0,0x00,0x0b, - 0x63,0x72,0x65,0x61,0x74,0x65,0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65, - 0x93,0x0d,0x01,0x07,0x1a,0x0f,0x3f,0x01,0xf4,0x01,0x0c,0x07,0x00,0x00,0x54,0x07, - 0x07,0x80,0x34,0x07,0x00,0x00,0x37,0x07,0x01,0x07,0x25,0x08,0x02,0x00,0x3e,0x07, - 0x02,0x02,0x0e,0x00,0x07,0x00,0x54,0x08,0x01,0x80,0x25,0x07,0x03,0x00,0x0c,0x08, - 0x01,0x00,0x54,0x08,0x07,0x80,0x34,0x08,0x00,0x00,0x37,0x08,0x01,0x08,0x25,0x09, - 0x04,0x00,0x3e,0x08,0x02,0x02,0x0e,0x00,0x08,0x00,0x54,0x09,0x01,0x80,0x25,0x08, - 0x05,0x00,0x0c,0x09,0x02,0x00,0x54,0x09,0x07,0x80,0x34,0x09,0x00,0x00,0x37,0x09, - 0x01,0x09,0x25,0x0a,0x06,0x00,0x3e,0x09,0x02,0x02,0x0e,0x00,0x09,0x00,0x54,0x0a, - 0x01,0x80,0x25,0x09,0x07,0x00,0x0c,0x0a,0x04,0x00,0x54,0x0a,0x07,0x80,0x34,0x0a, - 0x00,0x00,0x37,0x0a,0x01,0x0a,0x25,0x0b,0x08,0x00,0x3e,0x0a,0x02,0x02,0x0e,0x00, - 0x0a,0x00,0x54,0x0b,0x01,0x80,0x29,0x0a,0x00,0x00,0x0c,0x0b,0x05,0x00,0x54,0x0b, - 0x07,0x80,0x34,0x0b,0x00,0x00,0x37,0x0b,0x01,0x0b,0x25,0x0c,0x09,0x00,0x3e,0x0b, - 0x02,0x02,0x0e,0x00,0x0b,0x00,0x54,0x0c,0x01,0x80,0x29,0x0b,0x00,0x00,0x2b,0x0c, - 0x00,0x00,0x37,0x0c,0x0a,0x0c,0x10,0x0d,0x0a,0x00,0x10,0x0e,0x0b,0x00,0x10,0x0f, - 0x06,0x00,0x3e,0x0c,0x04,0x01,0x0c,0x0c,0x03,0x00,0x54,0x0c,0x07,0x80,0x34,0x0c, - 0x00,0x00,0x37,0x0c,0x01,0x0c,0x25,0x0d,0x0b,0x00,0x3e,0x0c,0x02,0x02,0x0e,0x00, - 0x0c,0x00,0x54,0x0d,0x01,0x80,0x25,0x0c,0x0c,0x00,0x34,0x0d,0x0d,0x00,0x10,0x0e, - 0x0c,0x00,0x3e,0x0d,0x02,0x02,0x2b,0x0e,0x01,0x00,0x2b,0x0f,0x01,0x00,0x2b,0x10, - 0x01,0x00,0x37,0x11,0x0e,0x0d,0x37,0x12,0x0f,0x0d,0x37,0x13,0x10,0x0d,0x3a,0x13, - 0x10,0x10,0x3a,0x12,0x0f,0x0f,0x3a,0x11,0x0e,0x0e,0x34,0x0e,0x11,0x00,0x37,0x0f, - 0x12,0x0d,0x3e,0x0f,0x01,0x00,0x3d,0x0e,0x00,0x02,0x10,0x10,0x0e,0x00,0x37,0x0f, - 0x13,0x0e,0x29,0x11,0x00,0x00,0x3e,0x0f,0x03,0x01,0x2a,0x0f,0x10,0x00,0x34,0x11, - 0x14,0x00,0x34,0x12,0x15,0x00,0x37,0x12,0x16,0x12,0x25,0x13,0x17,0x00,0x2b,0x14, - 0x02,0x00,0x3e,0x12,0x03,0x00,0x3d,0x11,0x00,0x01,0x34,0x11,0x14,0x00,0x34,0x12, - 0x15,0x00,0x37,0x12,0x16,0x12,0x25,0x13,0x18,0x00,0x10,0x14,0x07,0x00,0x10,0x15, - 0x08,0x00,0x3e,0x12,0x04,0x00,0x3d,0x11,0x00,0x01,0x10,0x12,0x0e,0x00,0x37,0x11, - 0x19,0x0e,0x10,0x13,0x07,0x00,0x10,0x14,0x08,0x00,0x3e,0x11,0x04,0x03,0x10,0x10, - 0x12,0x00,0x10,0x0f,0x11,0x00,0x27,0x11,0x01,0x00,0x27,0x12,0x04,0x00,0x27,0x13, - 0x01,0x00,0x49,0x11,0x1a,0x80,0x0f,0x00,0x0f,0x00,0x54,0x15,0x05,0x80,0x34,0x15, - 0x14,0x00,0x25,0x16,0x1a,0x00,0x3e,0x15,0x02,0x01,0x54,0x11,0x14,0x80,0x54,0x15, - 0x12,0x80,0x37,0x15,0x1b,0x0d,0x28,0x16,0x00,0x00,0x3e,0x15,0x02,0x01,0x34,0x15, - 0x14,0x00,0x34,0x16,0x15,0x00,0x37,0x16,0x16,0x16,0x25,0x17,0x1c,0x00,0x10,0x18, - 0x07,0x00,0x10,0x19,0x08,0x00,0x3e,0x16,0x04,0x00,0x3d,0x15,0x00,0x01,0x10,0x16, - 0x0e,0x00,0x37,0x15,0x19,0x0e,0x10,0x17,0x07,0x00,0x10,0x18,0x08,0x00,0x3e,0x15, - 0x04,0x03,0x10,0x10,0x16,0x00,0x10,0x0f,0x15,0x00,0x4b,0x11,0xe6,0x7f,0x0f,0x00, - 0x10,0x00,0x54,0x11,0x09,0x80,0x34,0x11,0x1d,0x00,0x34,0x12,0x15,0x00,0x37,0x12, - 0x16,0x12,0x25,0x13,0x1e,0x00,0x10,0x14,0x07,0x00,0x10,0x15,0x08,0x00,0x10,0x16, - 0x10,0x00,0x3e,0x12,0x05,0x00,0x3d,0x11,0x00,0x01,0x2b,0x11,0x00,0x00,0x37,0x11, - 0x1f,0x11,0x2b,0x12,0x04,0x00,0x37,0x12,0x20,0x12,0x27,0x13,0x01,0x00,0x3e,0x12, - 0x02,0x02,0x37,0x12,0x21,0x12,0x3e,0x11,0x02,0x02,0x2c,0x03,0x11,0x00,0x2b,0x11, - 0x00,0x00,0x37,0x11,0x1f,0x11,0x2b,0x12,0x04,0x00,0x37,0x12,0x20,0x12,0x37,0x13, - 0x12,0x0d,0x3e,0x12,0x02,0x02,0x37,0x12,0x21,0x12,0x3e,0x11,0x02,0x02,0x2c,0x05, - 0x11,0x00,0x29,0x11,0x00,0x00,0x27,0x12,0x02,0x00,0x34,0x13,0x22,0x00,0x37,0x13, - 0x23,0x13,0x27,0x14,0x01,0x00,0x49,0x12,0x0e,0x80,0x2b,0x16,0x04,0x00,0x37,0x16, - 0x20,0x16,0x10,0x17,0x15,0x00,0x3e,0x16,0x02,0x02,0x0e,0x00,0x16,0x00,0x54,0x17, - 0x01,0x80,0x54,0x12,0x07,0x80,0x2b,0x17,0x00,0x00,0x37,0x17,0x1f,0x17,0x37,0x18, - 0x21,0x16,0x3e,0x17,0x02,0x02,0x0c,0x11,0x17,0x00,0x54,0x18,0x00,0x80,0x4b,0x12, - 0xf2,0x7f,0x0e,0x00,0x11,0x00,0x54,0x12,0x01,0x80,0x25,0x11,0x24,0x00,0x2b,0x12, - 0x06,0x00,0x3e,0x12,0x01,0x02,0x0e,0x00,0x12,0x00,0x54,0x13,0x01,0x80,0x25,0x12, - 0x25,0x00,0x2b,0x13,0x07,0x00,0x27,0x14,0x01,0x00,0x39,0x14,0x12,0x13,0x34,0x13, - 0x26,0x00,0x34,0x14,0x00,0x00,0x37,0x14,0x27,0x14,0x3e,0x14,0x01,0x00,0x3d,0x13, - 0x00,0x02,0x25,0x14,0x28,0x00,0x34,0x15,0x26,0x00,0x10,0x16,0x12,0x00,0x3e,0x15, - 0x02,0x02,0x24,0x13,0x15,0x13,0x2b,0x14,0x08,0x00,0x37,0x14,0x29,0x14,0x10,0x15, - 0x0e,0x00,0x33,0x16,0x2a,0x00,0x33,0x17,0x2b,0x00,0x3a,0x09,0x2c,0x17,0x3a,0x13, - 0x2d,0x17,0x34,0x18,0x26,0x00,0x10,0x19,0x12,0x00,0x3e,0x18,0x02,0x02,0x3a,0x18, - 0x2e,0x17,0x3a,0x11,0x2f,0x17,0x3a,0x17,0x30,0x16,0x3e,0x14,0x03,0x01,0x33,0x14, - 0x31,0x00,0x3a,0x0e,0x32,0x14,0x3a,0x13,0x33,0x14,0x2b,0x15,0x01,0x00,0x37,0x15, - 0x34,0x15,0x2b,0x16,0x06,0x00,0x3e,0x15,0x02,0x02,0x3a,0x15,0x35,0x14,0x2c,0x09, - 0x14,0x00,0x2b,0x15,0x0a,0x00,0x10,0x16,0x14,0x00,0x3e,0x15,0x02,0x01,0x2b,0x15, - 0x04,0x00,0x37,0x15,0x36,0x15,0x2b,0x16,0x0b,0x00,0x25,0x17,0x37,0x00,0x3e,0x15, - 0x03,0x01,0x31,0x15,0x38,0x00,0x34,0x16,0x39,0x00,0x31,0x17,0x3b,0x00,0x3a,0x17, - 0x3a,0x16,0x31,0x16,0x3c,0x00,0x34,0x17,0x39,0x00,0x31,0x18,0x3e,0x00,0x3a,0x18, - 0x3d,0x17,0x30,0x00,0x00,0x80,0x48,0x14,0x02,0x00,0x04,0xc0,0x03,0xc0,0x00,0xc0, - 0x10,0x80,0x01,0xc0,0x11,0x80,0x0a,0xc0,0x15,0xc0,0x05,0xc0,0x12,0x80,0x17,0xc0, - 0x1a,0x80,0x0f,0xc0,0x02,0xc0,0x0e,0xc0,0x00,0x09,0x77,0x72,0x61,0x70,0x00,0x00, - 0x0b,0x72,0x65,0x73,0x75,0x6d,0x65,0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e, - 0x65,0x00,0x08,0x72,0x6c,0x63,0x0c,0x73,0x65,0x74,0x68,0x6f,0x6f,0x6b,0x09,0x63, - 0x6f,0x72,0x6f,0x12,0x43,0x75,0x72,0x72,0x65,0x6e,0x74,0x54,0x68,0x72,0x65,0x61, - 0x64,0x07,0x69,0x64,0x08,0x73,0x6b,0x74,0x01,0x00,0x01,0x0a,0x73,0x74,0x61,0x74, - 0x65,0x0d,0x73,0x74,0x61,0x72,0x74,0x69,0x6e,0x67,0x09,0x61,0x74,0x74,0x72,0x0c, - 0x66,0x69,0x6c,0x65,0x75,0x72,0x69,0x0b,0x74,0x68,0x72,0x65,0x61,0x64,0x0c,0x73, - 0x65,0x73,0x73,0x69,0x6f,0x6e,0x0b,0x69,0x64,0x65,0x6b,0x65,0x79,0x01,0x00,0x04, - 0x0d,0x6c,0x61,0x6e,0x67,0x75,0x61,0x67,0x65,0x08,0x4c,0x75,0x61,0x0b,0x70,0x61, - 0x72,0x65,0x6e,0x74,0x05,0x0a,0x61,0x70,0x70,0x69,0x64,0x0d,0x4c,0x75,0x61,0x20, - 0x44,0x42,0x47,0x70,0x15,0x70,0x72,0x6f,0x74,0x6f,0x63,0x6f,0x6c,0x5f,0x76,0x65, - 0x72,0x73,0x69,0x6f,0x6e,0x08,0x31,0x2e,0x30,0x01,0x00,0x01,0x08,0x74,0x61,0x67, - 0x09,0x69,0x6e,0x69,0x74,0x0d,0x73,0x65,0x6e,0x64,0x5f,0x78,0x6d,0x6c,0x06,0x5f, - 0x09,0x74,0x69,0x6d,0x65,0x0d,0x74,0x6f,0x73,0x74,0x72,0x69,0x6e,0x67,0x09,0x6d, - 0x61,0x69,0x6e,0x0e,0x75,0x6e,0x6b,0x6e,0x6f,0x77,0x6e,0x3a,0x2f,0x09,0x68,0x75, - 0x67,0x65,0x09,0x6d,0x61,0x74,0x68,0x0b,0x73,0x6f,0x75,0x72,0x63,0x65,0x0c,0x67, - 0x65,0x74,0x69,0x6e,0x66,0x6f,0x0c,0x67,0x65,0x74,0x5f,0x75,0x72,0x69,0x21,0x43, - 0x61,0x6e,0x6e,0x6f,0x74,0x20,0x63,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x20,0x74,0x6f, - 0x20,0x25,0x73,0x3a,0x25,0x64,0x20,0x3a,0x20,0x25,0x73,0x0a,0x65,0x72,0x72,0x6f, - 0x72,0x30,0x44,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x3a,0x20,0x52,0x65,0x74,0x72, - 0x79,0x69,0x6e,0x67,0x20,0x74,0x6f,0x20,0x63,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x20, - 0x74,0x6f,0x20,0x25,0x73,0x3a,0x25,0x73,0x20,0x2e,0x2e,0x2e,0x20,0x0a,0x73,0x6c, - 0x65,0x65,0x70,0x22,0x44,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x3a,0x20,0x43,0x6f, - 0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x20,0x73,0x75,0x63,0x63,0x65,0x65,0x64, - 0x2e,0x0c,0x63,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x2e,0x44,0x65,0x62,0x75,0x67,0x67, - 0x65,0x72,0x3a,0x20,0x54,0x72,0x79,0x69,0x6e,0x67,0x20,0x74,0x6f,0x20,0x63,0x6f, - 0x6e,0x6e,0x65,0x63,0x74,0x20,0x74,0x6f,0x20,0x25,0x73,0x3a,0x25,0x73,0x20,0x2e, - 0x2e,0x2e,0x20,0x11,0x44,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x20,0x76,0x25,0x73, - 0x0b,0x66,0x6f,0x72,0x6d,0x61,0x74,0x0b,0x73,0x74,0x72,0x69,0x6e,0x67,0x0a,0x70, - 0x72,0x69,0x6e,0x74,0x0f,0x73,0x65,0x74,0x74,0x69,0x6d,0x65,0x6f,0x75,0x74,0x0b, - 0x63,0x72,0x65,0x61,0x74,0x65,0x0b,0x61,0x73,0x73,0x65,0x72,0x74,0x0a,0x75,0x6e, - 0x62,0x36,0x34,0x0b,0x72,0x61,0x77,0x62,0x36,0x34,0x08,0x62,0x36,0x34,0x0c,0x72, - 0x65,0x71,0x75,0x69,0x72,0x65,0x21,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e, - 0x74,0x72,0x61,0x6e,0x73,0x70,0x6f,0x72,0x74,0x2e,0x6c,0x75,0x61,0x73,0x6f,0x63, - 0x6b,0x65,0x74,0x13,0x44,0x42,0x47,0x50,0x5f,0x54,0x52,0x41,0x4e,0x53,0x50,0x4f, - 0x52,0x54,0x09,0x69,0x6e,0x69,0x74,0x14,0x44,0x42,0x47,0x50,0x5f,0x57,0x4f,0x52, - 0x4b,0x49,0x4e,0x47,0x44,0x49,0x52,0x12,0x44,0x42,0x47,0x50,0x5f,0x50,0x4c,0x41, - 0x54,0x46,0x4f,0x52,0x4d,0x0e,0x6c,0x75,0x61,0x69,0x64,0x65,0x6b,0x65,0x79,0x10, - 0x44,0x42,0x47,0x50,0x5f,0x49,0x44,0x45,0x4b,0x45,0x59,0x0a,0x31,0x30,0x30,0x30, - 0x30,0x11,0x44,0x42,0x47,0x50,0x5f,0x49,0x44,0x45,0x50,0x4f,0x52,0x54,0x0e,0x31, - 0x32,0x37,0x2e,0x30,0x2e,0x30,0x2e,0x31,0x11,0x44,0x42,0x47,0x50,0x5f,0x49,0x44, - 0x45,0x48,0x4f,0x53,0x54,0x0b,0x67,0x65,0x74,0x65,0x6e,0x76,0x07,0x6f,0x73,0x01, - 0x80,0x80,0x80,0xff,0x03,0xdc,0x0d,0x03,0x00,0x1e,0x00,0x79,0x00,0xe6,0x01,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x03,0x00,0x3a,0x01,0x02,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x05,0x00,0x3a,0x01,0x04,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x07,0x00,0x3a,0x01,0x06,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x09,0x00,0x3a,0x01,0x08,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x0b,0x00,0x3a,0x01,0x0a,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x0d,0x00,0x3a,0x01,0x0c,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x0f,0x00,0x3a,0x01,0x0e,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x11,0x00,0x3a,0x01,0x10,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x13,0x00,0x3a,0x01,0x12,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x15,0x00,0x3a,0x01,0x14,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x17,0x00,0x3a,0x01,0x16,0x00,0x34, - 0x00,0x00,0x00,0x37,0x00,0x01,0x00,0x31,0x01,0x19,0x00,0x3a,0x01,0x18,0x00,0x25, - 0x00,0x1a,0x00,0x34,0x01,0x1b,0x00,0x25,0x02,0x1c,0x00,0x3e,0x01,0x02,0x02,0x32, - 0x02,0x00,0x00,0x34,0x03,0x00,0x00,0x37,0x03,0x1d,0x03,0x3a,0x02,0x1e,0x03,0x34, - 0x03,0x1b,0x00,0x25,0x04,0x16,0x00,0x3e,0x03,0x02,0x02,0x34,0x04,0x1b,0x00,0x25, - 0x05,0x14,0x00,0x3e,0x04,0x02,0x02,0x34,0x05,0x1b,0x00,0x25,0x06,0x0c,0x00,0x3e, - 0x05,0x02,0x02,0x34,0x06,0x1b,0x00,0x25,0x07,0x08,0x00,0x3e,0x06,0x02,0x02,0x34, - 0x07,0x1b,0x00,0x25,0x08,0x0a,0x00,0x3e,0x07,0x02,0x02,0x34,0x08,0x1b,0x00,0x25, - 0x09,0x18,0x00,0x3e,0x08,0x02,0x02,0x37,0x09,0x1f,0x03,0x34,0x0a,0x20,0x00,0x37, - 0x0a,0x21,0x0a,0x34,0x0b,0x20,0x00,0x37,0x0b,0x22,0x0b,0x34,0x0c,0x20,0x00,0x37, - 0x0c,0x23,0x0c,0x34,0x0d,0x20,0x00,0x37,0x0d,0x24,0x0d,0x34,0x0e,0x20,0x00,0x37, - 0x0e,0x25,0x0e,0x34,0x0f,0x20,0x00,0x37,0x0f,0x26,0x0f,0x2a,0x10,0x12,0x00,0x33, - 0x13,0x28,0x00,0x34,0x14,0x29,0x00,0x32,0x15,0x00,0x00,0x33,0x16,0x2a,0x00,0x3e, - 0x14,0x03,0x02,0x3a,0x14,0x2b,0x13,0x34,0x14,0x29,0x00,0x32,0x15,0x00,0x00,0x33, - 0x16,0x2c,0x00,0x3e,0x14,0x03,0x02,0x3a,0x14,0x2d,0x13,0x3a,0x13,0x27,0x02,0x29, - 0x13,0x00,0x00,0x34,0x14,0x2e,0x00,0x07,0x14,0x2f,0x00,0x54,0x14,0x03,0x80,0x34, - 0x14,0x30,0x00,0x10,0x13,0x14,0x00,0x54,0x14,0x0b,0x80,0x34,0x14,0x2e,0x00,0x07, - 0x14,0x31,0x00,0x54,0x14,0x03,0x80,0x37,0x14,0x32,0x01,0x31,0x13,0x33,0x00,0x30, - 0x14,0x05,0x80,0x34,0x14,0x34,0x00,0x34,0x15,0x2e,0x00,0x25,0x16,0x35,0x00,0x24, - 0x15,0x16,0x15,0x3e,0x14,0x02,0x01,0x34,0x14,0x36,0x00,0x33,0x15,0x39,0x00,0x34, - 0x16,0x36,0x00,0x37,0x16,0x38,0x16,0x3a,0x16,0x38,0x15,0x34,0x16,0x36,0x00,0x37, - 0x16,0x3a,0x16,0x3a,0x16,0x3a,0x15,0x34,0x16,0x36,0x00,0x37,0x16,0x3b,0x16,0x3a, - 0x16,0x3b,0x15,0x34,0x16,0x36,0x00,0x37,0x16,0x3c,0x16,0x3a,0x16,0x3c,0x15,0x3a, - 0x15,0x37,0x14,0x31,0x14,0x3d,0x00,0x35,0x14,0x3e,0x00,0x34,0x14,0x36,0x00,0x31, - 0x15,0x3f,0x00,0x3a,0x15,0x38,0x14,0x31,0x14,0x40,0x00,0x33,0x15,0x43,0x00,0x31, - 0x16,0x42,0x00,0x3a,0x16,0x44,0x15,0x3a,0x14,0x45,0x15,0x3a,0x14,0x46,0x15,0x3a, - 0x14,0x47,0x15,0x3a,0x14,0x48,0x15,0x3a,0x15,0x41,0x02,0x37,0x15,0x41,0x02,0x37, - 0x16,0x41,0x02,0x3a,0x16,0x49,0x15,0x33,0x15,0x4c,0x00,0x31,0x16,0x4b,0x00,0x3a, - 0x16,0x44,0x15,0x31,0x16,0x4d,0x00,0x3a,0x16,0x45,0x15,0x31,0x16,0x4e,0x00,0x3a, - 0x16,0x46,0x15,0x31,0x16,0x4f,0x00,0x3a,0x16,0x47,0x15,0x31,0x16,0x50,0x00,0x3a, - 0x16,0x48,0x15,0x3a,0x15,0x4a,0x02,0x37,0x15,0x4a,0x02,0x37,0x16,0x4a,0x02,0x3a, - 0x16,0x49,0x15,0x34,0x15,0x29,0x00,0x32,0x16,0x00,0x00,0x33,0x17,0x51,0x00,0x3e, - 0x15,0x03,0x02,0x33,0x16,0x5a,0x00,0x33,0x17,0x54,0x00,0x31,0x18,0x53,0x00,0x3a, - 0x18,0x55,0x17,0x31,0x18,0x56,0x00,0x3a,0x18,0x57,0x17,0x31,0x18,0x58,0x00,0x3a, - 0x18,0x59,0x17,0x3a,0x17,0x5b,0x16,0x3a,0x16,0x52,0x02,0x32,0x16,0x00,0x00,0x3a, - 0x16,0x5c,0x02,0x32,0x16,0x00,0x00,0x32,0x17,0x00,0x00,0x32,0x18,0x00,0x00,0x29, - 0x19,0x00,0x00,0x27,0x1a,0x00,0x00,0x37,0x1b,0x52,0x02,0x31,0x1c,0x5e,0x00,0x3a, - 0x1c,0x5d,0x1b,0x37,0x1b,0x52,0x02,0x31,0x1c,0x60,0x00,0x3a,0x1c,0x5f,0x1b,0x37, - 0x1b,0x52,0x02,0x31,0x1c,0x62,0x00,0x3a,0x1c,0x61,0x1b,0x37,0x1b,0x52,0x02,0x31, - 0x1c,0x64,0x00,0x3a,0x1c,0x63,0x1b,0x37,0x1b,0x52,0x02,0x31,0x1c,0x66,0x00,0x3a, - 0x1c,0x65,0x1b,0x37,0x1b,0x5c,0x02,0x31,0x1c,0x68,0x00,0x3a,0x1c,0x67,0x1b,0x37, - 0x1b,0x5c,0x02,0x31,0x1c,0x6a,0x00,0x3a,0x1c,0x69,0x1b,0x37,0x1b,0x5c,0x02,0x31, - 0x1c,0x6c,0x00,0x3a,0x1c,0x6b,0x1b,0x30,0x16,0x00,0x80,0x31,0x16,0x6e,0x00,0x3a, - 0x16,0x6d,0x02,0x31,0x16,0x6f,0x00,0x31,0x17,0x70,0x00,0x31,0x18,0x71,0x00,0x10, - 0x19,0x0b,0x00,0x31,0x1a,0x72,0x00,0x3e,0x19,0x02,0x02,0x31,0x1a,0x73,0x00,0x34, - 0x1b,0x74,0x00,0x34,0x1c,0x75,0x00,0x25,0x1d,0x76,0x00,0x3e,0x1b,0x03,0x02,0x0f, - 0x00,0x1b,0x00,0x54,0x1c,0x01,0x80,0x31,0x1a,0x77,0x00,0x31,0x1b,0x78,0x00,0x30, - 0x00,0x00,0x80,0x48,0x1b,0x02,0x00,0x00,0x00,0x08,0x6a,0x69,0x74,0x07,0x5f,0x47, - 0x0b,0x72,0x61,0x77,0x67,0x65,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x1e,0x70,0x72, - 0x65,0x76,0x69,0x6f,0x75,0x73,0x5f,0x63,0x6f,0x6e,0x74,0x65,0x78,0x74,0x5f,0x72, - 0x65,0x73,0x70,0x6f,0x6e,0x73,0x65,0x00,0x0c,0x64,0x69,0x73,0x63,0x61,0x72,0x64, - 0x00,0x0f,0x64,0x6f,0x65,0x73,0x5f,0x6d,0x61,0x74,0x63,0x68,0x00,0x0d,0x72,0x65, - 0x67,0x69,0x73,0x74,0x65,0x72,0x00,0x0c,0x67,0x65,0x74,0x5f,0x78,0x6d,0x6c,0x00, - 0x0b,0x72,0x65,0x6d,0x6f,0x76,0x65,0x00,0x08,0x67,0x65,0x74,0x00,0x07,0x61,0x74, - 0x00,0x0b,0x69,0x6e,0x73,0x65,0x72,0x74,0x0b,0x65,0x76,0x65,0x6e,0x74,0x73,0x13, - 0x68,0x69,0x74,0x5f,0x63,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x73,0x01,0x00, - 0x00,0x06,0x25,0x00,0x07,0x3d,0x3d,0x00,0x07,0x3e,0x3d,0x01,0x00,0x00,0x00,0x10, - 0x62,0x72,0x65,0x61,0x6b,0x70,0x6f,0x69,0x6e,0x74,0x73,0x01,0x00,0x01,0x0b,0x5f, - 0x5f,0x6d,0x6f,0x64,0x65,0x06,0x6b,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x10, - 0x63,0x6f,0x70,0x79,0x5f,0x6f,0x75,0x74,0x70,0x75,0x74,0x0c,0x5f,0x5f,0x69,0x6e, - 0x64,0x65,0x78,0x09,0x73,0x65,0x65,0x6b,0x0c,0x73,0x65,0x74,0x76,0x62,0x75,0x66, - 0x0a,0x63,0x6c,0x6f,0x73,0x65,0x0a,0x66,0x6c,0x75,0x73,0x68,0x0a,0x77,0x72,0x69, - 0x74,0x65,0x01,0x00,0x00,0x00,0x14,0x72,0x65,0x64,0x69,0x72,0x65,0x63,0x74,0x5f, - 0x6f,0x75,0x74,0x70,0x75,0x74,0x00,0x00,0x0a,0x70,0x72,0x69,0x6e,0x74,0x00,0x0b, - 0x73,0x74,0x64,0x65,0x72,0x72,0x0b,0x73,0x74,0x64,0x6f,0x75,0x74,0x0a,0x73,0x74, - 0x64,0x69,0x6e,0x01,0x00,0x00,0x0b,0x6f,0x75,0x74,0x70,0x75,0x74,0x09,0x62,0x61, - 0x73,0x65,0x07,0x69,0x6f,0x16,0x69,0x73,0x20,0x6e,0x6f,0x74,0x20,0x73,0x75,0x70, - 0x70,0x6f,0x72,0x74,0x65,0x64,0x2e,0x0a,0x65,0x72,0x72,0x6f,0x72,0x00,0x0f,0x73, - 0x65,0x74,0x75,0x70,0x76,0x61,0x6c,0x75,0x65,0x0c,0x4c,0x75,0x61,0x20,0x35,0x2e, - 0x32,0x0c,0x73,0x65,0x74,0x66,0x65,0x6e,0x76,0x0c,0x4c,0x75,0x61,0x20,0x35,0x2e, - 0x31,0x0d,0x5f,0x56,0x45,0x52,0x53,0x49,0x4f,0x4e,0x0e,0x66,0x72,0x6f,0x6d,0x5f, - 0x63,0x6f,0x72,0x6f,0x01,0x00,0x01,0x0b,0x5f,0x5f,0x6d,0x6f,0x64,0x65,0x06,0x6b, - 0x0c,0x66,0x72,0x6f,0x6d,0x5f,0x69,0x64,0x01,0x00,0x01,0x0b,0x5f,0x5f,0x6d,0x6f, - 0x64,0x65,0x06,0x76,0x11,0x73,0x65,0x74,0x6d,0x65,0x74,0x61,0x74,0x61,0x62,0x6c, - 0x65,0x01,0x00,0x01,0x06,0x6e,0x03,0x00,0x16,0x61,0x63,0x74,0x69,0x76,0x65,0x5f, - 0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x73,0x0b,0x73,0x74,0x61,0x74,0x75, - 0x73,0x0b,0x72,0x65,0x73,0x75,0x6d,0x65,0x0a,0x79,0x69,0x65,0x6c,0x64,0x09,0x77, - 0x72,0x61,0x70,0x0b,0x63,0x72,0x65,0x61,0x74,0x65,0x0c,0x72,0x75,0x6e,0x6e,0x69, - 0x6e,0x67,0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x08,0x6c,0x6f,0x67, - 0x12,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x63,0x6f,0x72,0x65,0x0b,0x6c, - 0x6f,0x61,0x64,0x65,0x64,0x0a,0x64,0x65,0x62,0x75,0x67,0x0c,0x72,0x65,0x71,0x75, - 0x69,0x72,0x65,0x0a,0x31,0x2e,0x31,0x2e,0x30,0x00,0x11,0x64,0x65,0x62,0x75,0x67, - 0x67,0x65,0x72,0x2e,0x75,0x72,0x6c,0x00,0x12,0x64,0x65,0x62,0x75,0x67,0x67,0x65, - 0x72,0x2e,0x75,0x74,0x69,0x6c,0x00,0x16,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72, - 0x2e,0x70,0x6c,0x61,0x74,0x66,0x6f,0x72,0x6d,0x00,0x21,0x64,0x65,0x62,0x75,0x67, - 0x67,0x65,0x72,0x2e,0x70,0x6c,0x75,0x67,0x69,0x6e,0x73,0x2e,0x66,0x66,0x69,0x2e, - 0x72,0x65,0x66,0x6c,0x65,0x63,0x74,0x00,0x19,0x64,0x65,0x62,0x75,0x67,0x67,0x65, - 0x72,0x2e,0x70,0x6c,0x75,0x67,0x69,0x6e,0x73,0x2e,0x66,0x66,0x69,0x00,0x1b,0x64, - 0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x69,0x6e,0x74,0x72,0x6f,0x73,0x70,0x65, - 0x63,0x74,0x69,0x6f,0x6e,0x00,0x12,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e, - 0x64,0x62,0x67,0x70,0x00,0x15,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x63, - 0x6f,0x6e,0x74,0x65,0x78,0x74,0x00,0x16,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72, - 0x2e,0x63,0x6f,0x6d,0x6d,0x61,0x6e,0x64,0x73,0x00,0x27,0x64,0x65,0x62,0x75,0x67, - 0x67,0x65,0x72,0x2e,0x74,0x72,0x61,0x6e,0x73,0x70,0x6f,0x72,0x74,0x2e,0x6c,0x75, - 0x61,0x73,0x6f,0x63,0x6b,0x65,0x74,0x5f,0x73,0x63,0x68,0x65,0x64,0x00,0x21,0x64, - 0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x74,0x72,0x61,0x6e,0x73,0x70,0x6f,0x72, - 0x74,0x2e,0x6c,0x75,0x61,0x73,0x6f,0x63,0x6b,0x65,0x74,0x00,0x1b,0x64,0x65,0x62, + 0x01,0x00,0x0a,0x63,0x6c,0x6f,0x73,0x65,0x08,0x6f,0x75,0x74,0x27,0x02,0x01,0x04, + 0x00,0x02,0x00,0x05,0x37,0x01,0x00,0x00,0x10,0x02,0x01,0x00,0x37,0x01,0x01,0x01, + 0x43,0x03,0x01,0x00,0x3f,0x01,0x01,0x00,0x0c,0x73,0x65,0x74,0x76,0x62,0x75,0x66, + 0x08,0x6f,0x75,0x74,0x24,0x02,0x01,0x04,0x00,0x02,0x00,0x05,0x37,0x01,0x00,0x00, + 0x10,0x02,0x01,0x00,0x37,0x01,0x01,0x01,0x43,0x03,0x01,0x00,0x3f,0x01,0x01,0x00, + 0x09,0x73,0x65,0x65,0x6b,0x08,0x6f,0x75,0x74,0x1f,0x00,0x02,0x03,0x00,0x00,0x00, + 0x06,0x02,0x01,0x00,0x00,0x54,0x02,0x02,0x80,0x29,0x02,0x01,0x00,0x54,0x03,0x01, + 0x80,0x29,0x02,0x02,0x00,0x48,0x02,0x02,0x00,0x1f,0x00,0x02,0x03,0x00,0x00,0x00, + 0x06,0x04,0x00,0x01,0x00,0x54,0x02,0x02,0x80,0x29,0x02,0x01,0x00,0x54,0x03,0x01, + 0x80,0x29,0x02,0x02,0x00,0x48,0x02,0x02,0x00,0x24,0x00,0x02,0x03,0x00,0x00,0x01, + 0x07,0x22,0x02,0x01,0x00,0x08,0x02,0x00,0x00,0x54,0x02,0x02,0x80,0x29,0x02,0x01, + 0x00,0x54,0x03,0x01,0x80,0x29,0x02,0x02,0x00,0x48,0x02,0x02,0x00,0x00,0x42,0x00, + 0x01,0x03,0x01,0x00,0x01,0x0e,0x2b,0x01,0x00,0x00,0x36,0x01,0x00,0x01,0x0b,0x01, + 0x00,0x00,0x54,0x01,0x04,0x80,0x2b,0x01,0x00,0x00,0x27,0x02,0x01,0x00,0x39,0x02, + 0x00,0x01,0x54,0x01,0x05,0x80,0x2b,0x01,0x00,0x00,0x2b,0x02,0x00,0x00,0x36,0x02, + 0x00,0x02,0x14,0x02,0x00,0x02,0x39,0x02,0x00,0x01,0x47,0x00,0x01,0x00,0x1b,0xc0, + 0x02,0x56,0x00,0x01,0x03,0x01,0x00,0x01,0x13,0x2b,0x01,0x00,0x00,0x36,0x01,0x00, + 0x01,0x0e,0x00,0x01,0x00,0x54,0x01,0x0b,0x80,0x2b,0x01,0x00,0x00,0x36,0x01,0x00, + 0x01,0x27,0x02,0x01,0x00,0x01,0x02,0x01,0x00,0x54,0x01,0x06,0x80,0x2b,0x01,0x00, + 0x00,0x2b,0x02,0x00,0x00,0x36,0x02,0x00,0x02,0x15,0x02,0x00,0x02,0x39,0x02,0x00, + 0x01,0x54,0x01,0x03,0x80,0x2b,0x01,0x00,0x00,0x29,0x02,0x00,0x00,0x39,0x02,0x00, + 0x01,0x47,0x00,0x01,0x00,0x1b,0xc0,0x02,0x15,0x00,0x01,0x02,0x01,0x00,0x00,0x03, + 0x2b,0x01,0x00,0x00,0x36,0x01,0x00,0x01,0x48,0x01,0x02,0x00,0x1b,0xc0,0xa0,0x02, + 0x00,0x01,0x08,0x06,0x0b,0x01,0x2f,0x2b,0x01,0x00,0x00,0x14,0x02,0x00,0x01,0x2c, + 0x00,0x02,0x00,0x3a,0x01,0x00,0x00,0x2b,0x02,0x01,0x00,0x37,0x02,0x01,0x02,0x37, + 0x03,0x02,0x00,0x3e,0x02,0x02,0x02,0x2b,0x03,0x01,0x00,0x37,0x03,0x03,0x03,0x33, + 0x04,0x05,0x00,0x37,0x05,0x04,0x02,0x3a,0x05,0x04,0x04,0x2b,0x05,0x02,0x00,0x37, + 0x05,0x06,0x05,0x37,0x06,0x07,0x02,0x3e,0x05,0x02,0x02,0x3a,0x05,0x07,0x04,0x3e, + 0x03,0x02,0x02,0x3a,0x03,0x02,0x00,0x2b,0x03,0x03,0x00,0x37,0x04,0x02,0x00,0x36, + 0x03,0x04,0x03,0x0e,0x00,0x03,0x00,0x54,0x04,0x04,0x80,0x32,0x03,0x00,0x00,0x2b, + 0x04,0x03,0x00,0x37,0x05,0x02,0x00,0x39,0x03,0x05,0x04,0x37,0x04,0x08,0x00,0x36, + 0x04,0x04,0x03,0x0e,0x00,0x04,0x00,0x54,0x05,0x03,0x80,0x32,0x04,0x00,0x00,0x37, + 0x05,0x08,0x00,0x39,0x04,0x05,0x03,0x2b,0x05,0x04,0x00,0x37,0x06,0x08,0x00,0x3e, + 0x05,0x02,0x01,0x34,0x05,0x09,0x00,0x37,0x05,0x0a,0x05,0x10,0x06,0x04,0x00,0x10, + 0x07,0x00,0x00,0x3e,0x05,0x03,0x01,0x2b,0x05,0x05,0x00,0x39,0x00,0x01,0x05,0x48, + 0x01,0x02,0x00,0x1a,0x80,0x08,0xc0,0x04,0xc0,0x16,0xc0,0x1c,0xc0,0x17,0xc0,0x0b, + 0x69,0x6e,0x73,0x65,0x72,0x74,0x0a,0x74,0x61,0x62,0x6c,0x65,0x0b,0x6c,0x69,0x6e, + 0x65,0x6e,0x6f,0x09,0x70,0x61,0x74,0x68,0x0e,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x69, + 0x7a,0x65,0x01,0x00,0x01,0x0e,0x61,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79,0x05, + 0x0b,0x73,0x63,0x68,0x65,0x6d,0x65,0x0a,0x62,0x75,0x69,0x6c,0x64,0x0d,0x66,0x69, + 0x6c,0x65,0x6e,0x61,0x6d,0x65,0x0a,0x70,0x61,0x72,0x73,0x65,0x07,0x69,0x64,0x02, + 0x91,0x05,0x00,0x02,0x14,0x06,0x17,0x01,0x69,0x10,0x03,0x00,0x00,0x37,0x02,0x00, + 0x00,0x25,0x04,0x01,0x00,0x13,0x04,0x04,0x00,0x14,0x04,0x00,0x04,0x3e,0x02,0x03, + 0x02,0x34,0x03,0x02,0x00,0x2b,0x04,0x00,0x00,0x3e,0x03,0x02,0x04,0x44,0x06,0x0c, + 0x80,0x10,0x09,0x06,0x00,0x37,0x08,0x03,0x06,0x10,0x0a,0x02,0x00,0x3e,0x08,0x03, + 0x03,0x35,0x09,0x04,0x00,0x35,0x08,0x05,0x00,0x34,0x08,0x04,0x00,0x13,0x09,0x06, + 0x00,0x05,0x08,0x09,0x00,0x54,0x08,0x02,0x80,0x10,0x00,0x06,0x00,0x54,0x03,0x02, + 0x80,0x42,0x06,0x03,0x03,0x4e,0x06,0xf2,0x7f,0x2b,0x03,0x00,0x00,0x36,0x03,0x00, + 0x03,0x0f,0x00,0x03,0x00,0x54,0x04,0x03,0x80,0x2b,0x03,0x00,0x00,0x36,0x03,0x00, + 0x03,0x36,0x03,0x01,0x03,0x0e,0x00,0x03,0x00,0x54,0x04,0x02,0x80,0x29,0x04,0x00, + 0x00,0x48,0x04,0x02,0x00,0x29,0x04,0x01,0x00,0x34,0x05,0x02,0x00,0x10,0x06,0x03, + 0x00,0x3e,0x05,0x02,0x04,0x44,0x08,0x3e,0x80,0x37,0x0a,0x06,0x09,0x07,0x0a,0x07, + 0x00,0x54,0x0a,0x3b,0x80,0x29,0x0a,0x02,0x00,0x37,0x0b,0x08,0x09,0x0f,0x00,0x0b, + 0x00,0x54,0x0c,0x1f,0x80,0x2b,0x0b,0x01,0x00,0x37,0x0b,0x09,0x0b,0x10,0x0c,0x0b, + 0x00,0x37,0x0b,0x0a,0x0b,0x2b,0x0d,0x02,0x00,0x37,0x0d,0x0b,0x0d,0x27,0x0e,0x00, + 0x00,0x3e,0x0b,0x04,0x02,0x2b,0x0c,0x03,0x00,0x37,0x0d,0x08,0x09,0x10,0x0e,0x0b, + 0x00,0x3e,0x0c,0x03,0x01,0x34,0x0c,0x0c,0x00,0x37,0x0d,0x08,0x09,0x3e,0x0c,0x02, + 0x03,0x0e,0x00,0x0c,0x00,0x54,0x0e,0x07,0x80,0x2b,0x0e,0x04,0x00,0x25,0x0f,0x0d, + 0x00,0x25,0x10,0x0e,0x00,0x10,0x11,0x00,0x00,0x10,0x12,0x01,0x00,0x10,0x13,0x0d, + 0x00,0x3e,0x0e,0x06,0x01,0x0f,0x00,0x0c,0x00,0x54,0x0e,0x04,0x80,0x10,0x0a,0x0d, + 0x00,0x54,0x0e,0x03,0x80,0x29,0x0a,0x01,0x00,0x54,0x0e,0x01,0x80,0x29,0x0a,0x02, + 0x00,0x0f,0x00,0x0a,0x00,0x54,0x0b,0x16,0x80,0x37,0x0b,0x0f,0x09,0x14,0x0b,0x00, + 0x0b,0x3a,0x0b,0x0f,0x09,0x2b,0x0b,0x05,0x00,0x37,0x0b,0x10,0x0b,0x37,0x0b,0x11, + 0x0b,0x37,0x0c,0x12,0x09,0x36,0x0b,0x0c,0x0b,0x37,0x0c,0x0f,0x09,0x37,0x0d,0x13, + 0x09,0x3e,0x0b,0x03,0x02,0x0f,0x00,0x0b,0x00,0x54,0x0c,0x09,0x80,0x37,0x0b,0x14, + 0x09,0x0f,0x00,0x0b,0x00,0x54,0x0c,0x05,0x80,0x2b,0x0b,0x05,0x00,0x37,0x0b,0x10, + 0x0b,0x37,0x0b,0x15,0x0b,0x37,0x0c,0x16,0x09,0x3e,0x0b,0x02,0x01,0x29,0x04,0x02, + 0x00,0x42,0x08,0x03,0x03,0x4e,0x08,0xc0,0x7f,0x48,0x04,0x02,0x00,0x16,0xc0,0x07, + 0xc0,0x12,0x80,0x13,0x80,0x09,0xc0,0x02,0xc0,0x07,0x69,0x64,0x0b,0x72,0x65,0x6d, + 0x6f,0x76,0x65,0x0e,0x74,0x65,0x6d,0x70,0x6f,0x72,0x61,0x72,0x79,0x0e,0x68,0x69, + 0x74,0x5f,0x76,0x61,0x6c,0x75,0x65,0x12,0x68,0x69,0x74,0x5f,0x63,0x6f,0x6e,0x64, + 0x69,0x74,0x69,0x6f,0x6e,0x13,0x68,0x69,0x74,0x5f,0x63,0x6f,0x6e,0x64,0x69,0x74, + 0x69,0x6f,0x6e,0x73,0x10,0x62,0x72,0x65,0x61,0x6b,0x70,0x6f,0x69,0x6e,0x74,0x73, + 0x0e,0x68,0x69,0x74,0x5f,0x63,0x6f,0x75,0x6e,0x74,0x3c,0x43,0x6f,0x6e,0x64,0x69, + 0x74,0x69,0x6f,0x6e,0x20,0x65,0x76,0x61,0x6c,0x75,0x61,0x74,0x69,0x6f,0x6e,0x20, + 0x66,0x61,0x69,0x6c,0x65,0x64,0x20,0x66,0x6f,0x72,0x20,0x62,0x72,0x65,0x61,0x6b, + 0x70,0x6f,0x69,0x6e,0x74,0x20,0x61,0x74,0x20,0x25,0x73,0x3a,0x25,0x64,0x3a,0x20, + 0x25,0x73,0x0a,0x45,0x52,0x52,0x4f,0x52,0x0a,0x70,0x63,0x61,0x6c,0x6c,0x09,0x63, + 0x6f,0x72,0x6f,0x08,0x6e,0x65,0x77,0x0c,0x43,0x6f,0x6e,0x74,0x65,0x78,0x74,0x0e, + 0x63,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x0c,0x65,0x6e,0x61,0x62,0x6c,0x65, + 0x64,0x0a,0x73,0x74,0x61,0x74,0x65,0x06,0x69,0x06,0x6a,0x09,0x66,0x69,0x6e,0x64, + 0x0a,0x70,0x61,0x69,0x72,0x73,0x0c,0x66,0x69,0x6c,0x65,0x3a,0x2f,0x2f,0x08,0x73, + 0x75,0x62,0x02,0x2d,0x00,0x01,0x02,0x01,0x00,0x00,0x09,0x0f,0x00,0x00,0x00,0x54, + 0x01,0x04,0x80,0x2b,0x01,0x00,0x00,0x36,0x01,0x00,0x01,0x48,0x01,0x02,0x00,0x54, + 0x01,0x02,0x80,0x2b,0x01,0x00,0x00,0x48,0x01,0x02,0x00,0x47,0x00,0x01,0x00,0x17, + 0xc0,0x8b,0x02,0x00,0x01,0x0a,0x03,0x05,0x00,0x37,0x2b,0x01,0x00,0x00,0x36,0x01, + 0x00,0x01,0x0f,0x00,0x01,0x00,0x54,0x02,0x31,0x80,0x2b,0x02,0x00,0x00,0x29,0x03, + 0x00,0x00,0x39,0x03,0x00,0x02,0x2b,0x02,0x01,0x00,0x37,0x03,0x00,0x01,0x36,0x02, + 0x03,0x02,0x37,0x03,0x01,0x01,0x36,0x02,0x03,0x02,0x27,0x03,0x01,0x00,0x13,0x04, + 0x02,0x00,0x27,0x05,0x01,0x00,0x49,0x03,0x0a,0x80,0x36,0x07,0x06,0x02,0x05,0x07, + 0x01,0x00,0x54,0x07,0x06,0x80,0x34,0x07,0x02,0x00,0x37,0x07,0x03,0x07,0x10,0x08, + 0x02,0x00,0x10,0x09,0x06,0x00,0x3e,0x07,0x03,0x01,0x54,0x03,0x01,0x80,0x4b,0x03, + 0xf6,0x7f,0x2b,0x03,0x02,0x00,0x37,0x04,0x01,0x01,0x3e,0x03,0x02,0x01,0x34,0x03, + 0x04,0x00,0x10,0x04,0x02,0x00,0x3e,0x03,0x02,0x02,0x0e,0x00,0x03,0x00,0x54,0x03, + 0x06,0x80,0x2b,0x03,0x01,0x00,0x37,0x04,0x00,0x01,0x36,0x03,0x04,0x03,0x37,0x04, + 0x01,0x01,0x29,0x05,0x00,0x00,0x39,0x05,0x04,0x03,0x34,0x03,0x04,0x00,0x2b,0x04, + 0x01,0x00,0x37,0x05,0x00,0x01,0x36,0x04,0x05,0x04,0x3e,0x03,0x02,0x02,0x0e,0x00, + 0x03,0x00,0x54,0x03,0x04,0x80,0x2b,0x03,0x01,0x00,0x37,0x04,0x00,0x01,0x29,0x05, + 0x00,0x00,0x39,0x05,0x04,0x03,0x29,0x03,0x02,0x00,0x48,0x03,0x02,0x00,0x29,0x02, + 0x01,0x00,0x48,0x02,0x02,0x00,0x17,0xc0,0x16,0xc0,0x1d,0xc0,0x09,0x6e,0x65,0x78, + 0x74,0x0b,0x72,0x65,0x6d,0x6f,0x76,0x65,0x0a,0x74,0x61,0x62,0x6c,0x65,0x0b,0x6c, + 0x69,0x6e,0x65,0x6e,0x6f,0x0d,0x66,0x69,0x6c,0x65,0x6e,0x61,0x6d,0x65,0x91,0x02, + 0x00,0x01,0x09,0x01,0x09,0x00,0x27,0x2b,0x01,0x00,0x00,0x36,0x01,0x00,0x01,0x0e, + 0x00,0x01,0x00,0x54,0x02,0x07,0x80,0x29,0x02,0x00,0x00,0x25,0x03,0x00,0x00,0x34, + 0x04,0x01,0x00,0x10,0x05,0x00,0x00,0x3e,0x04,0x02,0x02,0x24,0x03,0x04,0x03,0x46, + 0x02,0x03,0x00,0x33,0x02,0x02,0x00,0x32,0x03,0x00,0x00,0x3a,0x03,0x03,0x02,0x34, + 0x03,0x04,0x00,0x10,0x04,0x01,0x00,0x3e,0x03,0x02,0x04,0x44,0x06,0x02,0x80,0x37, + 0x08,0x03,0x02,0x39,0x07,0x06,0x08,0x42,0x06,0x03,0x03,0x4e,0x06,0xfc,0x7f,0x37, + 0x03,0x05,0x01,0x0f,0x00,0x03,0x00,0x54,0x04,0x04,0x80,0x33,0x03,0x06,0x00,0x37, + 0x04,0x05,0x01,0x3b,0x04,0x01,0x03,0x3b,0x03,0x01,0x02,0x37,0x03,0x03,0x02,0x29, + 0x04,0x00,0x00,0x3a,0x04,0x05,0x03,0x37,0x03,0x03,0x02,0x29,0x04,0x00,0x00,0x3a, + 0x04,0x07,0x03,0x37,0x03,0x03,0x02,0x29,0x04,0x00,0x00,0x3a,0x04,0x08,0x03,0x48, + 0x02,0x02,0x00,0x17,0xc0,0x0e,0x74,0x65,0x6d,0x70,0x6f,0x72,0x61,0x72,0x79,0x0e, + 0x63,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x01,0x00,0x01,0x08,0x74,0x61,0x67, + 0x0f,0x65,0x78,0x70,0x72,0x65,0x73,0x73,0x69,0x6f,0x6e,0x0f,0x65,0x78,0x70,0x72, + 0x65,0x73,0x73,0x69,0x6f,0x6e,0x0a,0x70,0x61,0x69,0x72,0x73,0x09,0x61,0x74,0x74, + 0x72,0x01,0x00,0x01,0x08,0x74,0x61,0x67,0x0f,0x62,0x72,0x65,0x61,0x6b,0x70,0x6f, + 0x69,0x6e,0x74,0x0d,0x74,0x6f,0x73,0x74,0x72,0x69,0x6e,0x67,0x19,0x4e,0x6f,0x20, + 0x73,0x75,0x63,0x68,0x20,0x62,0x72,0x65,0x61,0x6b,0x70,0x6f,0x69,0x6e,0x74,0x3a, + 0x20,0xae,0x01,0x00,0x01,0x08,0x05,0x05,0x00,0x19,0x2b,0x01,0x00,0x00,0x37,0x01, + 0x00,0x01,0x38,0x01,0x01,0x01,0x2b,0x02,0x01,0x00,0x25,0x03,0x01,0x00,0x25,0x04, + 0x02,0x00,0x10,0x05,0x00,0x00,0x34,0x06,0x03,0x00,0x10,0x07,0x01,0x00,0x3e,0x06, + 0x02,0x02,0x2b,0x07,0x02,0x00,0x36,0x07,0x01,0x07,0x3e,0x02,0x06,0x01,0x07,0x00, + 0x04,0x00,0x54,0x02,0x02,0x80,0x2f,0x03,0x02,0x00,0x54,0x02,0x07,0x80,0x2b,0x02, + 0x04,0x00,0x32,0x03,0x03,0x00,0x3b,0x00,0x01,0x03,0x2b,0x04,0x02,0x00,0x36,0x04, + 0x01,0x04,0x3b,0x04,0x02,0x03,0x39,0x03,0x01,0x02,0x47,0x00,0x01,0x00,0x12,0x80, + 0x09,0xc0,0x15,0xc0,0x19,0x80,0x18,0xc0,0x09,0x69,0x6e,0x74,0x6f,0x0d,0x74,0x6f, + 0x73,0x74,0x72,0x69,0x6e,0x67,0x24,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65, + 0x64,0x20,0x25,0x73,0x20,0x65,0x76,0x65,0x6e,0x74,0x20,0x66,0x6f,0x72,0x20,0x25, + 0x73,0x20,0x28,0x25,0x64,0x29,0x0a,0x44,0x45,0x42,0x55,0x47,0x09,0x63,0x6f,0x72, + 0x6f,0xc6,0x01,0x00,0x00,0x09,0x05,0x06,0x00,0x22,0x2b,0x00,0x00,0x00,0x0f,0x00, + 0x00,0x00,0x54,0x01,0x02,0x80,0x29,0x00,0x02,0x00,0x48,0x00,0x02,0x00,0x2b,0x00, + 0x01,0x00,0x37,0x00,0x00,0x00,0x38,0x00,0x01,0x00,0x2b,0x01,0x02,0x00,0x36,0x01, + 0x00,0x01,0x0f,0x00,0x01,0x00,0x54,0x02,0x14,0x80,0x34,0x02,0x01,0x00,0x10,0x03, + 0x01,0x00,0x3e,0x02,0x02,0x03,0x2b,0x04,0x03,0x00,0x36,0x04,0x00,0x04,0x07,0x02, + 0x02,0x00,0x54,0x05,0x02,0x80,0x02,0x04,0x03,0x00,0x54,0x05,0x04,0x80,0x07,0x02, + 0x03,0x00,0x54,0x05,0x09,0x80,0x01,0x04,0x03,0x00,0x54,0x05,0x07,0x80,0x2b,0x05, + 0x04,0x00,0x25,0x06,0x04,0x00,0x25,0x07,0x05,0x00,0x10,0x08,0x02,0x00,0x3e,0x05, + 0x04,0x01,0x29,0x05,0x02,0x00,0x48,0x05,0x02,0x00,0x29,0x02,0x01,0x00,0x48,0x02, + 0x02,0x00,0x19,0x80,0x12,0x80,0x18,0xc0,0x15,0xc0,0x09,0xc0,0x16,0x45,0x76,0x65, + 0x6e,0x74,0x20,0x25,0x73,0x20,0x6d,0x61,0x74,0x63,0x68,0x65,0x64,0x21,0x0a,0x44, + 0x45,0x42,0x55,0x47,0x08,0x6f,0x75,0x74,0x09,0x6f,0x76,0x65,0x72,0x0b,0x75,0x6e, + 0x70,0x61,0x63,0x6b,0x09,0x63,0x6f,0x72,0x6f,0x32,0x00,0x00,0x03,0x03,0x01,0x00, + 0x08,0x2b,0x00,0x00,0x00,0x2b,0x01,0x01,0x00,0x37,0x01,0x00,0x01,0x38,0x01,0x01, + 0x01,0x29,0x02,0x00,0x00,0x39,0x02,0x01,0x00,0x2f,0x02,0x00,0x00,0x47,0x00,0x01, + 0x00,0x18,0xc0,0x12,0x80,0x19,0x80,0x09,0x63,0x6f,0x72,0x6f,0x9b,0x01,0x00,0x02, + 0x06,0x01,0x09,0x00,0x12,0x37,0x02,0x00,0x00,0x37,0x03,0x02,0x00,0x3a,0x03,0x01, + 0x02,0x37,0x02,0x00,0x00,0x0c,0x03,0x01,0x00,0x54,0x03,0x01,0x80,0x25,0x03,0x04, + 0x00,0x3a,0x03,0x03,0x02,0x2b,0x02,0x00,0x00,0x37,0x02,0x05,0x02,0x37,0x03,0x06, + 0x00,0x33,0x04,0x07,0x00,0x37,0x05,0x00,0x00,0x3a,0x05,0x08,0x04,0x3e,0x02,0x03, + 0x01,0x29,0x02,0x00,0x00,0x3a,0x02,0x00,0x00,0x47,0x00,0x01,0x00,0x05,0xc0,0x09, + 0x61,0x74,0x74,0x72,0x01,0x00,0x01,0x08,0x74,0x61,0x67,0x0d,0x72,0x65,0x73,0x70, + 0x6f,0x6e,0x73,0x65,0x08,0x73,0x6b,0x74,0x0d,0x73,0x65,0x6e,0x64,0x5f,0x78,0x6d, + 0x6c,0x07,0x6f,0x6b,0x0b,0x72,0x65,0x61,0x73,0x6f,0x6e,0x0a,0x73,0x74,0x61,0x74, + 0x65,0x0b,0x73,0x74,0x61,0x74,0x75,0x73,0x15,0x70,0x72,0x65,0x76,0x69,0x6f,0x75, + 0x73,0x5f,0x63,0x6f,0x6e,0x74,0x65,0x78,0x74,0xcf,0x01,0x00,0x00,0x07,0x04,0x08, + 0x00,0x1e,0x34,0x00,0x00,0x00,0x34,0x01,0x00,0x00,0x2b,0x02,0x00,0x00,0x2b,0x03, + 0x01,0x00,0x3a,0x03,0x02,0x01,0x3a,0x02,0x01,0x00,0x34,0x00,0x03,0x00,0x2b,0x01, + 0x02,0x00,0x37,0x01,0x04,0x01,0x37,0x01,0x05,0x01,0x3e,0x00,0x02,0x04,0x44,0x03, + 0x04,0x80,0x2b,0x05,0x03,0x00,0x37,0x05,0x06,0x05,0x10,0x06,0x04,0x00,0x3e,0x05, + 0x02,0x01,0x42,0x03,0x03,0x03,0x4e,0x03,0xfa,0x7f,0x2b,0x00,0x03,0x00,0x37,0x00, + 0x06,0x00,0x3e,0x00,0x01,0x01,0x2b,0x00,0x02,0x00,0x37,0x00,0x04,0x00,0x2b,0x01, + 0x02,0x00,0x37,0x01,0x04,0x01,0x32,0x02,0x00,0x00,0x32,0x03,0x00,0x00,0x3a,0x03, + 0x07,0x01,0x3a,0x02,0x05,0x00,0x47,0x00,0x01,0x00,0x0e,0xc0,0x0c,0xc0,0x02,0xc0, + 0x01,0xc0,0x0e,0x66,0x72,0x6f,0x6d,0x5f,0x63,0x6f,0x72,0x6f,0x0c,0x73,0x65,0x74, + 0x68,0x6f,0x6f,0x6b,0x0c,0x66,0x72,0x6f,0x6d,0x5f,0x69,0x64,0x16,0x61,0x63,0x74, + 0x69,0x76,0x65,0x5f,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x73,0x0a,0x70, + 0x61,0x69,0x72,0x73,0x09,0x77,0x72,0x61,0x70,0x0b,0x72,0x65,0x73,0x75,0x6d,0x65, + 0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x23,0x00,0x00,0x04,0x04,0x00, + 0x00,0x05,0x2b,0x00,0x00,0x00,0x2b,0x01,0x01,0x00,0x2b,0x02,0x02,0x00,0x2b,0x03, + 0x03,0x00,0x40,0x00,0x04,0x00,0x07,0xc0,0x00,0xc0,0x05,0xc0,0x06,0xc0,0xb7,0x08, + 0x01,0x02,0x14,0x07,0x26,0x01,0xa5,0x01,0x37,0x02,0x00,0x00,0x10,0x03,0x02,0x00, + 0x37,0x02,0x01,0x02,0x29,0x04,0x00,0x00,0x3e,0x02,0x03,0x01,0x0b,0x01,0x00,0x00, + 0x54,0x02,0x02,0x80,0x29,0x02,0x01,0x00,0x54,0x03,0x01,0x80,0x29,0x02,0x02,0x00, + 0x37,0x03,0x02,0x00,0x0f,0x00,0x03,0x00,0x54,0x04,0x08,0x80,0x0e,0x00,0x02,0x00, + 0x54,0x03,0x06,0x80,0x25,0x03,0x04,0x00,0x3a,0x03,0x03,0x00,0x2b,0x03,0x00,0x00, + 0x37,0x03,0x05,0x03,0x10,0x04,0x00,0x00,0x3e,0x03,0x02,0x01,0x2b,0x03,0x01,0x00, + 0x37,0x03,0x07,0x03,0x37,0x04,0x08,0x00,0x3e,0x03,0x02,0x02,0x3a,0x03,0x06,0x00, + 0x51,0x03,0x7f,0x80,0x0c,0x03,0x01,0x00,0x54,0x03,0x04,0x80,0x2b,0x03,0x02,0x00, + 0x37,0x03,0x09,0x03,0x37,0x04,0x00,0x00,0x3e,0x03,0x02,0x02,0x0e,0x00,0x03,0x00, + 0x54,0x04,0x07,0x80,0x2b,0x04,0x03,0x00,0x25,0x05,0x0a,0x00,0x25,0x06,0x0b,0x00, + 0x3e,0x04,0x03,0x01,0x2b,0x04,0x04,0x00,0x3e,0x04,0x01,0x01,0x30,0x03,0x70,0x80, + 0x29,0x01,0x00,0x00,0x2b,0x04,0x03,0x00,0x25,0x05,0x0c,0x00,0x10,0x06,0x03,0x00, + 0x3e,0x04,0x03,0x01,0x2b,0x04,0x02,0x00,0x37,0x04,0x0d,0x04,0x10,0x05,0x03,0x00, + 0x3e,0x04,0x02,0x04,0x2b,0x07,0x05,0x00,0x36,0x07,0x04,0x07,0x0f,0x00,0x07,0x00, + 0x54,0x08,0x4e,0x80,0x34,0x08,0x0e,0x00,0x31,0x09,0x0f,0x00,0x2b,0x0a,0x06,0x00, + 0x37,0x0a,0x10,0x0a,0x3e,0x08,0x03,0x03,0x0e,0x00,0x08,0x00,0x54,0x0a,0x34,0x80, + 0x2a,0x0a,0x0c,0x00,0x34,0x0d,0x11,0x00,0x10,0x0e,0x09,0x00,0x3e,0x0d,0x02,0x02, + 0x07,0x0d,0x12,0x00,0x54,0x0d,0x0d,0x80,0x34,0x0d,0x13,0x00,0x10,0x0e,0x09,0x00, + 0x3e,0x0d,0x02,0x02,0x2b,0x0e,0x02,0x00,0x37,0x0e,0x14,0x0e,0x05,0x0d,0x0e,0x00, + 0x54,0x0d,0x06,0x80,0x37,0x0d,0x15,0x09,0x37,0x0e,0x16,0x09,0x37,0x0c,0x17,0x09, + 0x10,0x0b,0x0e,0x00,0x10,0x0a,0x0d,0x00,0x54,0x0d,0x07,0x80,0x27,0x0d,0xe6,0x03, + 0x34,0x0e,0x18,0x00,0x10,0x0f,0x09,0x00,0x3e,0x0e,0x02,0x02,0x32,0x0c,0x00,0x00, + 0x10,0x0b,0x0e,0x00,0x10,0x0a,0x0d,0x00,0x2b,0x0d,0x03,0x00,0x25,0x0e,0x19,0x00, + 0x25,0x0f,0x1a,0x00,0x10,0x10,0x04,0x00,0x10,0x11,0x0a,0x00,0x34,0x12,0x18,0x00, + 0x10,0x13,0x0b,0x00,0x3e,0x12,0x02,0x00,0x3d,0x0d,0x04,0x01,0x10,0x0d,0x04,0x00, + 0x37,0x0e,0x1d,0x05,0x3a,0x0e,0x1c,0x0c,0x3a,0x0d,0x1b,0x0c,0x2b,0x0d,0x02,0x00, + 0x37,0x0d,0x1e,0x0d,0x37,0x0e,0x00,0x00,0x33,0x0f,0x1f,0x00,0x3a,0x0c,0x17,0x0f, + 0x2b,0x10,0x02,0x00,0x37,0x10,0x20,0x10,0x10,0x11,0x0a,0x00,0x10,0x12,0x0b,0x00, + 0x3e,0x10,0x03,0x00,0x3c,0x10,0x00,0x00,0x3e,0x0d,0x03,0x01,0x54,0x0a,0x27,0x80, + 0x0f,0x00,0x09,0x00,0x54,0x0a,0x07,0x80,0x33,0x0a,0x21,0x00,0x3a,0x04,0x1b,0x0a, + 0x37,0x0b,0x1d,0x05,0x3a,0x0b,0x1c,0x0a,0x3a,0x0a,0x02,0x00,0x30,0x03,0x20,0x80, + 0x54,0x0a,0x1e,0x80,0x0b,0x09,0x00,0x00,0x54,0x0a,0x04,0x80,0x0f,0x00,0x02,0x00, + 0x54,0x0a,0x02,0x80,0x30,0x03,0x1a,0x80,0x54,0x0a,0x18,0x80,0x0b,0x09,0x01,0x00, + 0x54,0x0a,0x16,0x80,0x29,0x02,0x01,0x00,0x54,0x08,0x14,0x80,0x2b,0x08,0x03,0x00, + 0x25,0x09,0x22,0x00,0x10,0x0a,0x04,0x00,0x24,0x09,0x0a,0x09,0x3e,0x08,0x02,0x01, + 0x2b,0x08,0x02,0x00,0x37,0x08,0x1e,0x08,0x37,0x09,0x00,0x00,0x33,0x0a,0x23,0x00, + 0x33,0x0b,0x24,0x00,0x3a,0x04,0x1b,0x0b,0x37,0x0c,0x1d,0x05,0x3a,0x0c,0x1c,0x0b, + 0x3a,0x0b,0x17,0x0a,0x2b,0x0b,0x02,0x00,0x37,0x0b,0x20,0x0b,0x27,0x0c,0x04,0x00, + 0x3e,0x0b,0x02,0x00,0x3c,0x0b,0x00,0x00,0x3e,0x08,0x03,0x01,0x30,0x03,0x80,0x7f, + 0x29,0x03,0x00,0x00,0x3a,0x03,0x06,0x00,0x25,0x03,0x25,0x00,0x3a,0x03,0x03,0x00, + 0x37,0x03,0x00,0x00,0x10,0x04,0x03,0x00,0x37,0x03,0x01,0x03,0x27,0x05,0x00,0x00, + 0x3e,0x03,0x03,0x01,0x30,0x00,0x00,0x80,0x47,0x00,0x01,0x00,0x02,0xc0,0x07,0xc0, + 0x05,0xc0,0x09,0xc0,0x16,0xc0,0x06,0xc0,0x01,0xc0,0x0c,0x72,0x75,0x6e,0x6e,0x69, + 0x6e,0x67,0x01,0x00,0x00,0x01,0x00,0x01,0x08,0x74,0x61,0x67,0x0d,0x72,0x65,0x73, + 0x70,0x6f,0x6e,0x73,0x65,0x1a,0x47,0x6f,0x74,0x20,0x75,0x6e,0x6b,0x6e,0x6f,0x77, + 0x6e,0x20,0x63,0x6f,0x6d,0x6d,0x61,0x6e,0x64,0x3a,0x20,0x01,0x00,0x00,0x0f,0x6d, + 0x61,0x6b,0x65,0x5f,0x65,0x72,0x72,0x6f,0x72,0x01,0x00,0x01,0x08,0x74,0x61,0x67, + 0x0d,0x72,0x65,0x73,0x70,0x6f,0x6e,0x73,0x65,0x0d,0x73,0x65,0x6e,0x64,0x5f,0x78, + 0x6d,0x6c,0x06,0x69,0x13,0x74,0x72,0x61,0x6e,0x73,0x61,0x63,0x74,0x69,0x6f,0x6e, + 0x5f,0x69,0x64,0x0c,0x63,0x6f,0x6d,0x6d,0x61,0x6e,0x64,0x1f,0x43,0x6f,0x6d,0x6d, + 0x61,0x6e,0x64,0x20,0x25,0x73,0x20,0x63,0x61,0x75,0x73,0x65,0x64,0x3a,0x20,0x28, + 0x25,0x64,0x29,0x20,0x25,0x73,0x0a,0x45,0x52,0x52,0x4f,0x52,0x0d,0x74,0x6f,0x73, + 0x74,0x72,0x69,0x6e,0x67,0x09,0x61,0x74,0x74,0x72,0x0c,0x6d,0x65,0x73,0x73,0x61, + 0x67,0x65,0x09,0x63,0x6f,0x64,0x65,0x17,0x44,0x42,0x47,0x50,0x5f,0x45,0x52,0x52, + 0x5f,0x4d,0x45,0x54,0x41,0x54,0x41,0x42,0x4c,0x45,0x11,0x67,0x65,0x74,0x6d,0x65, + 0x74,0x61,0x74,0x61,0x62,0x6c,0x65,0x0a,0x74,0x61,0x62,0x6c,0x65,0x09,0x74,0x79, + 0x70,0x65,0x0e,0x74,0x72,0x61,0x63,0x65,0x62,0x61,0x63,0x6b,0x00,0x0b,0x78,0x70, + 0x63,0x61,0x6c,0x6c,0x0e,0x63,0x6d,0x64,0x5f,0x70,0x61,0x72,0x73,0x65,0x0a,0x44, + 0x45,0x42,0x55,0x47,0x1d,0x6c,0x6f,0x73,0x74,0x20,0x64,0x65,0x62,0x75,0x67,0x67, + 0x65,0x72,0x20,0x63,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x69,0x6f,0x6e,0x0c,0x57,0x41, + 0x52,0x4e,0x49,0x4e,0x47,0x10,0x72,0x65,0x61,0x64,0x5f,0x70,0x61,0x63,0x6b,0x65, + 0x74,0x09,0x63,0x6f,0x72,0x6f,0x13,0x43,0x6f,0x6e,0x74,0x65,0x78,0x74,0x4d,0x61, + 0x6e,0x61,0x67,0x65,0x72,0x0a,0x73,0x74,0x61,0x63,0x6b,0x1e,0x70,0x72,0x65,0x76, + 0x69,0x6f,0x75,0x73,0x5f,0x63,0x6f,0x6e,0x74,0x65,0x78,0x74,0x5f,0x72,0x65,0x73, + 0x70,0x6f,0x6e,0x73,0x65,0x0a,0x62,0x72,0x65,0x61,0x6b,0x0a,0x73,0x74,0x61,0x74, + 0x65,0x15,0x70,0x72,0x65,0x76,0x69,0x6f,0x75,0x73,0x5f,0x63,0x6f,0x6e,0x74,0x65, + 0x78,0x74,0x0f,0x73,0x65,0x74,0x74,0x69,0x6d,0x65,0x6f,0x75,0x74,0x08,0x73,0x6b, + 0x74,0x03,0x80,0x80,0xc0,0x99,0x04,0xbd,0x03,0x00,0x01,0x09,0x08,0x10,0x00,0x49, + 0x2a,0x01,0x02,0x00,0x2b,0x03,0x00,0x00,0x37,0x03,0x00,0x03,0x37,0x03,0x01,0x03, + 0x10,0x04,0x00,0x00,0x3e,0x03,0x02,0x02,0x0a,0x03,0x00,0x00,0x54,0x03,0x26,0x80, + 0x2b,0x03,0x01,0x00,0x37,0x03,0x02,0x03,0x10,0x04,0x03,0x00,0x37,0x03,0x03,0x03, + 0x27,0x05,0x00,0x00,0x25,0x06,0x04,0x00,0x3e,0x03,0x04,0x02,0x2b,0x04,0x02,0x00, + 0x37,0x04,0x05,0x04,0x37,0x05,0x06,0x03,0x3e,0x04,0x02,0x02,0x0f,0x00,0x04,0x00, + 0x54,0x05,0x19,0x80,0x2b,0x05,0x03,0x00,0x04,0x04,0x05,0x00,0x54,0x05,0x16,0x80, + 0x2b,0x05,0x04,0x00,0x04,0x04,0x05,0x00,0x54,0x05,0x13,0x80,0x2b,0x05,0x00,0x00, + 0x37,0x05,0x00,0x05,0x37,0x05,0x07,0x05,0x10,0x06,0x04,0x00,0x10,0x07,0x00,0x00, + 0x3e,0x05,0x03,0x02,0x0c,0x01,0x05,0x00,0x54,0x06,0x05,0x80,0x2b,0x05,0x00,0x00, + 0x37,0x05,0x08,0x05,0x37,0x05,0x09,0x05,0x3e,0x05,0x01,0x02,0x10,0x01,0x05,0x00, + 0x0f,0x00,0x01,0x00,0x54,0x05,0x04,0x80,0x2b,0x05,0x00,0x00,0x37,0x05,0x08,0x05, + 0x37,0x05,0x0a,0x05,0x3e,0x05,0x01,0x01,0x0e,0x00,0x01,0x00,0x54,0x03,0x09,0x80, + 0x2b,0x03,0x05,0x00,0x37,0x03,0x0b,0x03,0x2b,0x04,0x01,0x00,0x37,0x04,0x0c,0x04, + 0x3e,0x03,0x02,0x02,0x10,0x02,0x03,0x00,0x0f,0x00,0x02,0x00,0x54,0x03,0x01,0x80, + 0x29,0x01,0x02,0x00,0x0f,0x00,0x01,0x00,0x54,0x03,0x0d,0x80,0x34,0x03,0x0d,0x00, + 0x2b,0x04,0x06,0x00,0x2b,0x05,0x01,0x00,0x10,0x06,0x02,0x00,0x3e,0x03,0x04,0x03, + 0x0e,0x00,0x03,0x00,0x54,0x05,0x06,0x80,0x2b,0x05,0x07,0x00,0x25,0x06,0x0e,0x00, + 0x25,0x07,0x0f,0x00,0x10,0x08,0x04,0x00,0x24,0x07,0x08,0x07,0x3e,0x05,0x03,0x01, + 0x47,0x00,0x01,0x00,0x02,0xc0,0x12,0x80,0x04,0xc0,0x10,0x80,0x11,0x80,0x05,0xc0, + 0x17,0xc0,0x09,0xc0,0x1d,0x45,0x72,0x72,0x6f,0x72,0x20,0x77,0x68,0x69,0x6c,0x65, + 0x20,0x64,0x65,0x62,0x75,0x67,0x20,0x6c,0x6f,0x6f,0x70,0x3a,0x20,0x0a,0x45,0x52, + 0x52,0x4f,0x52,0x0a,0x70,0x63,0x61,0x6c,0x6c,0x08,0x73,0x6b,0x74,0x10,0x72,0x65, + 0x61,0x64,0x5f,0x70,0x61,0x63,0x6b,0x65,0x74,0x0c,0x64,0x69,0x73,0x63,0x61,0x72, + 0x64,0x0f,0x64,0x6f,0x65,0x73,0x5f,0x6d,0x61,0x74,0x63,0x68,0x0b,0x65,0x76,0x65, + 0x6e,0x74,0x73,0x07,0x61,0x74,0x0b,0x73,0x6f,0x75,0x72,0x63,0x65,0x0c,0x67,0x65, + 0x74,0x5f,0x75,0x72,0x69,0x06,0x53,0x0c,0x67,0x65,0x74,0x69,0x6e,0x66,0x6f,0x09, + 0x63,0x6f,0x72,0x6f,0x0a,0x67,0x75,0x65,0x73,0x73,0x10,0x62,0x72,0x65,0x61,0x6b, + 0x70,0x6f,0x69,0x6e,0x74,0x73,0x2f,0x00,0x01,0x03,0x02,0x00,0x00,0x09,0x51,0x01, + 0x07,0x80,0x2b,0x01,0x00,0x00,0x10,0x02,0x00,0x00,0x3e,0x01,0x02,0x01,0x2b,0x01, + 0x01,0x00,0x3e,0x01,0x01,0x02,0x10,0x00,0x01,0x00,0x54,0x01,0xf8,0x7f,0x47,0x00, + 0x01,0x00,0x18,0xc0,0x0d,0xc0,0xa7,0x02,0x00,0x02,0x07,0x07,0x08,0x01,0x34,0x2b, + 0x02,0x00,0x00,0x3e,0x02,0x01,0x02,0x0e,0x00,0x02,0x00,0x54,0x03,0x01,0x80,0x25, + 0x02,0x00,0x00,0x07,0x00,0x01,0x00,0x54,0x03,0x06,0x80,0x2b,0x03,0x01,0x00,0x2b, + 0x04,0x01,0x00,0x36,0x04,0x02,0x04,0x14,0x04,0x00,0x04,0x39,0x04,0x02,0x03,0x54, + 0x03,0x26,0x80,0x07,0x00,0x02,0x00,0x54,0x03,0x01,0x80,0x54,0x03,0x23,0x80,0x06, + 0x00,0x03,0x00,0x54,0x03,0x02,0x80,0x07,0x00,0x04,0x00,0x54,0x03,0x06,0x80,0x2b, + 0x03,0x01,0x00,0x2b,0x04,0x01,0x00,0x36,0x04,0x02,0x04,0x15,0x04,0x00,0x04,0x39, + 0x04,0x02,0x03,0x54,0x03,0x19,0x80,0x2b,0x03,0x02,0x00,0x2b,0x04,0x03,0x00,0x37, + 0x04,0x06,0x04,0x2b,0x05,0x00,0x00,0x3e,0x05,0x01,0x00,0x3d,0x04,0x00,0x02,0x3a, + 0x04,0x05,0x03,0x2b,0x03,0x02,0x00,0x37,0x03,0x05,0x03,0x38,0x03,0x01,0x03,0x07, + 0x03,0x00,0x00,0x54,0x03,0x04,0x80,0x2b,0x03,0x04,0x00,0x10,0x04,0x01,0x00,0x3e, + 0x03,0x02,0x01,0x54,0x03,0x06,0x80,0x34,0x03,0x07,0x00,0x2b,0x04,0x05,0x00,0x2b, + 0x05,0x06,0x00,0x10,0x06,0x01,0x00,0x3e,0x04,0x03,0x00,0x3d,0x03,0x00,0x01,0x2b, + 0x03,0x02,0x00,0x29,0x04,0x00,0x00,0x3a,0x04,0x05,0x03,0x47,0x00,0x01,0x00,0x0a, + 0xc0,0x15,0xc0,0x12,0x80,0x03,0xc0,0x18,0xc0,0x0e,0xc0,0x19,0xc0,0x0b,0x61,0x73, + 0x73,0x65,0x72,0x74,0x12,0x43,0x75,0x72,0x72,0x65,0x6e,0x74,0x54,0x68,0x72,0x65, + 0x61,0x64,0x09,0x63,0x6f,0x72,0x6f,0x10,0x74,0x61,0x69,0x6c,0x20,0x72,0x65,0x74, + 0x75,0x72,0x6e,0x0b,0x72,0x65,0x74,0x75,0x72,0x6e,0x0e,0x74,0x61,0x69,0x6c,0x20, + 0x63,0x61,0x6c,0x6c,0x09,0x63,0x61,0x6c,0x6c,0x09,0x6d,0x61,0x69,0x6e,0x02,0xfc, + 0x02,0x00,0x02,0x07,0x08,0x0d,0x02,0x45,0x2b,0x02,0x00,0x00,0x3e,0x02,0x01,0x02, + 0x0e,0x00,0x02,0x00,0x54,0x03,0x01,0x80,0x25,0x02,0x00,0x00,0x07,0x00,0x01,0x00, + 0x54,0x03,0x0f,0x80,0x2b,0x03,0x01,0x00,0x37,0x03,0x02,0x03,0x27,0x04,0x02,0x00, + 0x25,0x05,0x03,0x00,0x3e,0x03,0x03,0x02,0x37,0x03,0x04,0x03,0x07,0x03,0x05,0x00, + 0x54,0x03,0x01,0x80,0x47,0x00,0x01,0x00,0x2b,0x03,0x02,0x00,0x2b,0x04,0x02,0x00, + 0x36,0x04,0x02,0x04,0x14,0x04,0x00,0x04,0x39,0x04,0x02,0x03,0x54,0x03,0x2e,0x80, + 0x06,0x00,0x06,0x00,0x54,0x03,0x02,0x80,0x07,0x00,0x07,0x00,0x54,0x03,0x0f,0x80, + 0x27,0x03,0x02,0x00,0x2b,0x04,0x01,0x00,0x37,0x04,0x02,0x04,0x10,0x05,0x03,0x00, + 0x25,0x06,0x08,0x00,0x3e,0x04,0x03,0x02,0x0f,0x00,0x04,0x00,0x54,0x05,0x03,0x80, + 0x51,0x04,0x02,0x80,0x14,0x03,0x00,0x03,0x54,0x04,0xf6,0x7f,0x2b,0x04,0x02,0x00, + 0x15,0x05,0x01,0x03,0x39,0x05,0x02,0x04,0x54,0x03,0x1b,0x80,0x07,0x00,0x09,0x00, + 0x54,0x03,0x19,0x80,0x2b,0x03,0x03,0x00,0x2b,0x04,0x04,0x00,0x37,0x04,0x0b,0x04, + 0x2b,0x05,0x00,0x00,0x3e,0x05,0x01,0x00,0x3d,0x04,0x00,0x02,0x3a,0x04,0x0a,0x03, + 0x2b,0x03,0x03,0x00,0x37,0x03,0x0a,0x03,0x38,0x03,0x01,0x03,0x07,0x03,0x00,0x00, + 0x54,0x03,0x04,0x80,0x2b,0x03,0x05,0x00,0x10,0x04,0x01,0x00,0x3e,0x03,0x02,0x01, + 0x54,0x03,0x06,0x80,0x34,0x03,0x0c,0x00,0x2b,0x04,0x06,0x00,0x2b,0x05,0x07,0x00, + 0x10,0x06,0x01,0x00,0x3e,0x04,0x03,0x00,0x3d,0x03,0x00,0x01,0x2b,0x03,0x03,0x00, + 0x29,0x04,0x00,0x00,0x3a,0x04,0x0a,0x03,0x47,0x00,0x01,0x00,0x0a,0xc0,0x01,0xc0, + 0x15,0xc0,0x12,0x80,0x03,0xc0,0x18,0xc0,0x0e,0xc0,0x19,0xc0,0x0b,0x61,0x73,0x73, + 0x65,0x72,0x74,0x12,0x43,0x75,0x72,0x72,0x65,0x6e,0x74,0x54,0x68,0x72,0x65,0x61, + 0x64,0x09,0x63,0x6f,0x72,0x6f,0x09,0x6c,0x69,0x6e,0x65,0x06,0x66,0x10,0x74,0x61, + 0x69,0x6c,0x20,0x72,0x65,0x74,0x75,0x72,0x6e,0x0b,0x72,0x65,0x74,0x75,0x72,0x6e, + 0x06,0x43,0x09,0x77,0x68,0x61,0x74,0x06,0x53,0x0c,0x67,0x65,0x74,0x69,0x6e,0x66, + 0x6f,0x09,0x63,0x61,0x6c,0x6c,0x09,0x6d,0x61,0x69,0x6e,0x02,0x04,0x96,0x01,0x02, + 0x01,0x04,0x03,0x04,0x00,0x18,0x2b,0x01,0x00,0x00,0x10,0x02,0x00,0x00,0x3e,0x01, + 0x02,0x02,0x07,0x01,0x00,0x00,0x54,0x01,0x11,0x80,0x2b,0x01,0x01,0x00,0x37,0x01, + 0x01,0x01,0x37,0x01,0x02,0x01,0x36,0x01,0x00,0x01,0x2b,0x02,0x01,0x00,0x37,0x02, + 0x01,0x02,0x37,0x02,0x03,0x02,0x29,0x03,0x00,0x00,0x39,0x03,0x01,0x02,0x2b,0x02, + 0x01,0x00,0x37,0x02,0x01,0x02,0x37,0x02,0x02,0x02,0x29,0x03,0x00,0x00,0x39,0x03, + 0x00,0x02,0x2b,0x02,0x02,0x00,0x29,0x03,0x00,0x00,0x39,0x03,0x00,0x02,0x43,0x01, + 0x01,0x00,0x45,0x01,0x00,0x00,0x0c,0x00,0x0d,0x00,0x07,0x00,0x0c,0x66,0x72,0x6f, + 0x6d,0x5f,0x69,0x64,0x0e,0x66,0x72,0x6f,0x6d,0x5f,0x63,0x6f,0x72,0x6f,0x16,0x61, + 0x63,0x74,0x69,0x76,0x65,0x5f,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x73, + 0x09,0x64,0x65,0x61,0x64,0xea,0x01,0x02,0x01,0x06,0x06,0x06,0x01,0x29,0x2b,0x01, + 0x00,0x00,0x36,0x01,0x00,0x01,0x0e,0x00,0x01,0x00,0x54,0x01,0x1e,0x80,0x2b,0x01, + 0x00,0x00,0x27,0x02,0x00,0x00,0x39,0x02,0x00,0x01,0x2b,0x01,0x01,0x00,0x37,0x01, + 0x00,0x01,0x2b,0x02,0x01,0x00,0x37,0x02,0x00,0x02,0x37,0x02,0x01,0x02,0x14,0x02, + 0x00,0x02,0x3a,0x02,0x01,0x01,0x2b,0x01,0x01,0x00,0x37,0x01,0x00,0x01,0x37,0x01, + 0x02,0x01,0x2b,0x02,0x01,0x00,0x37,0x02,0x00,0x02,0x37,0x02,0x01,0x02,0x39,0x00, + 0x02,0x01,0x2b,0x01,0x01,0x00,0x37,0x01,0x00,0x01,0x37,0x01,0x03,0x01,0x2b,0x02, + 0x01,0x00,0x37,0x02,0x00,0x02,0x37,0x02,0x01,0x02,0x39,0x02,0x00,0x01,0x2b,0x01, + 0x02,0x00,0x37,0x01,0x04,0x01,0x10,0x02,0x00,0x00,0x2b,0x03,0x03,0x00,0x25,0x04, + 0x05,0x00,0x3e,0x01,0x04,0x01,0x2b,0x01,0x04,0x00,0x10,0x02,0x00,0x00,0x2b,0x03, + 0x05,0x00,0x10,0x04,0x00,0x00,0x43,0x05,0x01,0x00,0x3d,0x03,0x01,0x00,0x3f,0x01, + 0x01,0x00,0x07,0x00,0x0d,0x00,0x04,0x00,0x0b,0x00,0x15,0xc0,0x0e,0x00,0x08,0x72, + 0x6c,0x63,0x0c,0x73,0x65,0x74,0x68,0x6f,0x6f,0x6b,0x0e,0x66,0x72,0x6f,0x6d,0x5f, + 0x63,0x6f,0x72,0x6f,0x0c,0x66,0x72,0x6f,0x6d,0x5f,0x69,0x64,0x06,0x6e,0x16,0x61, + 0x63,0x74,0x69,0x76,0x65,0x5f,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x73, + 0x02,0x29,0x02,0x01,0x03,0x00,0x01,0x00,0x07,0x0e,0x00,0x00,0x00,0x54,0x01,0x03, + 0x80,0x34,0x01,0x00,0x00,0x43,0x02,0x01,0x02,0x3e,0x01,0x02,0x01,0x43,0x01,0x01, + 0x00,0x45,0x01,0x00,0x00,0x0a,0x65,0x72,0x72,0x6f,0x72,0x38,0x02,0x00,0x04,0x02, + 0x02,0x00,0x07,0x2b,0x00,0x00,0x00,0x34,0x01,0x00,0x00,0x37,0x01,0x01,0x01,0x2b, + 0x02,0x01,0x00,0x43,0x03,0x00,0x00,0x3d,0x01,0x01,0x00,0x3f,0x00,0x00,0x00,0x00, + 0x00,0x01,0xc0,0x0b,0x72,0x65,0x73,0x75,0x6d,0x65,0x0e,0x63,0x6f,0x72,0x6f,0x75, + 0x74,0x69,0x6e,0x65,0x37,0x01,0x01,0x03,0x01,0x03,0x00,0x07,0x34,0x01,0x00,0x00, + 0x37,0x01,0x01,0x01,0x10,0x02,0x00,0x00,0x3e,0x01,0x02,0x02,0x31,0x02,0x02,0x00, + 0x30,0x00,0x00,0x80,0x48,0x02,0x02,0x00,0x16,0xc0,0x00,0x0b,0x63,0x72,0x65,0x61, + 0x74,0x65,0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x93,0x0d,0x01,0x07, + 0x1a,0x0f,0x3f,0x01,0xf4,0x01,0x0c,0x07,0x00,0x00,0x54,0x07,0x07,0x80,0x34,0x07, + 0x00,0x00,0x37,0x07,0x01,0x07,0x25,0x08,0x02,0x00,0x3e,0x07,0x02,0x02,0x0e,0x00, + 0x07,0x00,0x54,0x08,0x01,0x80,0x25,0x07,0x03,0x00,0x0c,0x08,0x01,0x00,0x54,0x08, + 0x07,0x80,0x34,0x08,0x00,0x00,0x37,0x08,0x01,0x08,0x25,0x09,0x04,0x00,0x3e,0x08, + 0x02,0x02,0x0e,0x00,0x08,0x00,0x54,0x09,0x01,0x80,0x25,0x08,0x05,0x00,0x0c,0x09, + 0x02,0x00,0x54,0x09,0x07,0x80,0x34,0x09,0x00,0x00,0x37,0x09,0x01,0x09,0x25,0x0a, + 0x06,0x00,0x3e,0x09,0x02,0x02,0x0e,0x00,0x09,0x00,0x54,0x0a,0x01,0x80,0x25,0x09, + 0x07,0x00,0x0c,0x0a,0x04,0x00,0x54,0x0a,0x07,0x80,0x34,0x0a,0x00,0x00,0x37,0x0a, + 0x01,0x0a,0x25,0x0b,0x08,0x00,0x3e,0x0a,0x02,0x02,0x0e,0x00,0x0a,0x00,0x54,0x0b, + 0x01,0x80,0x29,0x0a,0x00,0x00,0x0c,0x0b,0x05,0x00,0x54,0x0b,0x07,0x80,0x34,0x0b, + 0x00,0x00,0x37,0x0b,0x01,0x0b,0x25,0x0c,0x09,0x00,0x3e,0x0b,0x02,0x02,0x0e,0x00, + 0x0b,0x00,0x54,0x0c,0x01,0x80,0x29,0x0b,0x00,0x00,0x2b,0x0c,0x00,0x00,0x37,0x0c, + 0x0a,0x0c,0x10,0x0d,0x0a,0x00,0x10,0x0e,0x0b,0x00,0x10,0x0f,0x06,0x00,0x3e,0x0c, + 0x04,0x01,0x0c,0x0c,0x03,0x00,0x54,0x0c,0x07,0x80,0x34,0x0c,0x00,0x00,0x37,0x0c, + 0x01,0x0c,0x25,0x0d,0x0b,0x00,0x3e,0x0c,0x02,0x02,0x0e,0x00,0x0c,0x00,0x54,0x0d, + 0x01,0x80,0x25,0x0c,0x0c,0x00,0x34,0x0d,0x0d,0x00,0x10,0x0e,0x0c,0x00,0x3e,0x0d, + 0x02,0x02,0x2b,0x0e,0x01,0x00,0x2b,0x0f,0x01,0x00,0x2b,0x10,0x01,0x00,0x37,0x11, + 0x0e,0x0d,0x37,0x12,0x0f,0x0d,0x37,0x13,0x10,0x0d,0x3a,0x13,0x10,0x10,0x3a,0x12, + 0x0f,0x0f,0x3a,0x11,0x0e,0x0e,0x34,0x0e,0x11,0x00,0x37,0x0f,0x12,0x0d,0x3e,0x0f, + 0x01,0x00,0x3d,0x0e,0x00,0x02,0x10,0x10,0x0e,0x00,0x37,0x0f,0x13,0x0e,0x29,0x11, + 0x00,0x00,0x3e,0x0f,0x03,0x01,0x2a,0x0f,0x10,0x00,0x34,0x11,0x14,0x00,0x34,0x12, + 0x15,0x00,0x37,0x12,0x16,0x12,0x25,0x13,0x17,0x00,0x2b,0x14,0x02,0x00,0x3e,0x12, + 0x03,0x00,0x3d,0x11,0x00,0x01,0x34,0x11,0x14,0x00,0x34,0x12,0x15,0x00,0x37,0x12, + 0x16,0x12,0x25,0x13,0x18,0x00,0x10,0x14,0x07,0x00,0x10,0x15,0x08,0x00,0x3e,0x12, + 0x04,0x00,0x3d,0x11,0x00,0x01,0x10,0x12,0x0e,0x00,0x37,0x11,0x19,0x0e,0x10,0x13, + 0x07,0x00,0x10,0x14,0x08,0x00,0x3e,0x11,0x04,0x03,0x10,0x10,0x12,0x00,0x10,0x0f, + 0x11,0x00,0x27,0x11,0x01,0x00,0x27,0x12,0x04,0x00,0x27,0x13,0x01,0x00,0x49,0x11, + 0x1a,0x80,0x0f,0x00,0x0f,0x00,0x54,0x15,0x05,0x80,0x34,0x15,0x14,0x00,0x25,0x16, + 0x1a,0x00,0x3e,0x15,0x02,0x01,0x54,0x11,0x14,0x80,0x54,0x15,0x12,0x80,0x37,0x15, + 0x1b,0x0d,0x28,0x16,0x00,0x00,0x3e,0x15,0x02,0x01,0x34,0x15,0x14,0x00,0x34,0x16, + 0x15,0x00,0x37,0x16,0x16,0x16,0x25,0x17,0x1c,0x00,0x10,0x18,0x07,0x00,0x10,0x19, + 0x08,0x00,0x3e,0x16,0x04,0x00,0x3d,0x15,0x00,0x01,0x10,0x16,0x0e,0x00,0x37,0x15, + 0x19,0x0e,0x10,0x17,0x07,0x00,0x10,0x18,0x08,0x00,0x3e,0x15,0x04,0x03,0x10,0x10, + 0x16,0x00,0x10,0x0f,0x15,0x00,0x4b,0x11,0xe6,0x7f,0x0f,0x00,0x10,0x00,0x54,0x11, + 0x09,0x80,0x34,0x11,0x1d,0x00,0x34,0x12,0x15,0x00,0x37,0x12,0x16,0x12,0x25,0x13, + 0x1e,0x00,0x10,0x14,0x07,0x00,0x10,0x15,0x08,0x00,0x10,0x16,0x10,0x00,0x3e,0x12, + 0x05,0x00,0x3d,0x11,0x00,0x01,0x2b,0x11,0x00,0x00,0x37,0x11,0x1f,0x11,0x2b,0x12, + 0x04,0x00,0x37,0x12,0x20,0x12,0x27,0x13,0x01,0x00,0x3e,0x12,0x02,0x02,0x37,0x12, + 0x21,0x12,0x3e,0x11,0x02,0x02,0x2c,0x03,0x11,0x00,0x2b,0x11,0x00,0x00,0x37,0x11, + 0x1f,0x11,0x2b,0x12,0x04,0x00,0x37,0x12,0x20,0x12,0x37,0x13,0x12,0x0d,0x3e,0x12, + 0x02,0x02,0x37,0x12,0x21,0x12,0x3e,0x11,0x02,0x02,0x2c,0x05,0x11,0x00,0x29,0x11, + 0x00,0x00,0x27,0x12,0x02,0x00,0x34,0x13,0x22,0x00,0x37,0x13,0x23,0x13,0x27,0x14, + 0x01,0x00,0x49,0x12,0x0e,0x80,0x2b,0x16,0x04,0x00,0x37,0x16,0x20,0x16,0x10,0x17, + 0x15,0x00,0x3e,0x16,0x02,0x02,0x0e,0x00,0x16,0x00,0x54,0x17,0x01,0x80,0x54,0x12, + 0x07,0x80,0x2b,0x17,0x00,0x00,0x37,0x17,0x1f,0x17,0x37,0x18,0x21,0x16,0x3e,0x17, + 0x02,0x02,0x0c,0x11,0x17,0x00,0x54,0x18,0x00,0x80,0x4b,0x12,0xf2,0x7f,0x0e,0x00, + 0x11,0x00,0x54,0x12,0x01,0x80,0x25,0x11,0x24,0x00,0x2b,0x12,0x06,0x00,0x3e,0x12, + 0x01,0x02,0x0e,0x00,0x12,0x00,0x54,0x13,0x01,0x80,0x25,0x12,0x25,0x00,0x2b,0x13, + 0x07,0x00,0x27,0x14,0x01,0x00,0x39,0x14,0x12,0x13,0x34,0x13,0x26,0x00,0x34,0x14, + 0x00,0x00,0x37,0x14,0x27,0x14,0x3e,0x14,0x01,0x00,0x3d,0x13,0x00,0x02,0x25,0x14, + 0x28,0x00,0x34,0x15,0x26,0x00,0x10,0x16,0x12,0x00,0x3e,0x15,0x02,0x02,0x24,0x13, + 0x15,0x13,0x2b,0x14,0x08,0x00,0x37,0x14,0x29,0x14,0x10,0x15,0x0e,0x00,0x33,0x16, + 0x2a,0x00,0x33,0x17,0x2b,0x00,0x3a,0x09,0x2c,0x17,0x3a,0x13,0x2d,0x17,0x34,0x18, + 0x26,0x00,0x10,0x19,0x12,0x00,0x3e,0x18,0x02,0x02,0x3a,0x18,0x2e,0x17,0x3a,0x11, + 0x2f,0x17,0x3a,0x17,0x30,0x16,0x3e,0x14,0x03,0x01,0x33,0x14,0x31,0x00,0x3a,0x0e, + 0x32,0x14,0x3a,0x13,0x33,0x14,0x2b,0x15,0x01,0x00,0x37,0x15,0x34,0x15,0x2b,0x16, + 0x06,0x00,0x3e,0x15,0x02,0x02,0x3a,0x15,0x35,0x14,0x2c,0x09,0x14,0x00,0x2b,0x15, + 0x0a,0x00,0x10,0x16,0x14,0x00,0x3e,0x15,0x02,0x01,0x2b,0x15,0x04,0x00,0x37,0x15, + 0x36,0x15,0x2b,0x16,0x0b,0x00,0x25,0x17,0x37,0x00,0x3e,0x15,0x03,0x01,0x31,0x15, + 0x38,0x00,0x34,0x16,0x39,0x00,0x31,0x17,0x3b,0x00,0x3a,0x17,0x3a,0x16,0x31,0x16, + 0x3c,0x00,0x34,0x17,0x39,0x00,0x31,0x18,0x3e,0x00,0x3a,0x18,0x3d,0x17,0x30,0x00, + 0x00,0x80,0x48,0x14,0x02,0x00,0x04,0xc0,0x03,0xc0,0x00,0xc0,0x10,0x80,0x01,0xc0, + 0x11,0x80,0x0a,0xc0,0x15,0xc0,0x05,0xc0,0x12,0x80,0x17,0xc0,0x1a,0x80,0x0f,0xc0, + 0x02,0xc0,0x0e,0xc0,0x00,0x09,0x77,0x72,0x61,0x70,0x00,0x00,0x0b,0x72,0x65,0x73, + 0x75,0x6d,0x65,0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x00,0x08,0x72, + 0x6c,0x63,0x0c,0x73,0x65,0x74,0x68,0x6f,0x6f,0x6b,0x09,0x63,0x6f,0x72,0x6f,0x12, + 0x43,0x75,0x72,0x72,0x65,0x6e,0x74,0x54,0x68,0x72,0x65,0x61,0x64,0x07,0x69,0x64, + 0x08,0x73,0x6b,0x74,0x01,0x00,0x01,0x0a,0x73,0x74,0x61,0x74,0x65,0x0d,0x73,0x74, + 0x61,0x72,0x74,0x69,0x6e,0x67,0x09,0x61,0x74,0x74,0x72,0x0c,0x66,0x69,0x6c,0x65, + 0x75,0x72,0x69,0x0b,0x74,0x68,0x72,0x65,0x61,0x64,0x0c,0x73,0x65,0x73,0x73,0x69, + 0x6f,0x6e,0x0b,0x69,0x64,0x65,0x6b,0x65,0x79,0x01,0x00,0x04,0x0d,0x6c,0x61,0x6e, + 0x67,0x75,0x61,0x67,0x65,0x08,0x4c,0x75,0x61,0x0b,0x70,0x61,0x72,0x65,0x6e,0x74, + 0x05,0x0a,0x61,0x70,0x70,0x69,0x64,0x0d,0x4c,0x75,0x61,0x20,0x44,0x42,0x47,0x70, + 0x15,0x70,0x72,0x6f,0x74,0x6f,0x63,0x6f,0x6c,0x5f,0x76,0x65,0x72,0x73,0x69,0x6f, + 0x6e,0x08,0x31,0x2e,0x30,0x01,0x00,0x01,0x08,0x74,0x61,0x67,0x09,0x69,0x6e,0x69, + 0x74,0x0d,0x73,0x65,0x6e,0x64,0x5f,0x78,0x6d,0x6c,0x06,0x5f,0x09,0x74,0x69,0x6d, + 0x65,0x0d,0x74,0x6f,0x73,0x74,0x72,0x69,0x6e,0x67,0x09,0x6d,0x61,0x69,0x6e,0x0e, + 0x75,0x6e,0x6b,0x6e,0x6f,0x77,0x6e,0x3a,0x2f,0x09,0x68,0x75,0x67,0x65,0x09,0x6d, + 0x61,0x74,0x68,0x0b,0x73,0x6f,0x75,0x72,0x63,0x65,0x0c,0x67,0x65,0x74,0x69,0x6e, + 0x66,0x6f,0x0c,0x67,0x65,0x74,0x5f,0x75,0x72,0x69,0x21,0x43,0x61,0x6e,0x6e,0x6f, + 0x74,0x20,0x63,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x20,0x74,0x6f,0x20,0x25,0x73,0x3a, + 0x25,0x64,0x20,0x3a,0x20,0x25,0x73,0x0a,0x65,0x72,0x72,0x6f,0x72,0x30,0x44,0x65, + 0x62,0x75,0x67,0x67,0x65,0x72,0x3a,0x20,0x52,0x65,0x74,0x72,0x79,0x69,0x6e,0x67, + 0x20,0x74,0x6f,0x20,0x63,0x6f,0x6e,0x6e,0x65,0x63,0x74,0x20,0x74,0x6f,0x20,0x25, + 0x73,0x3a,0x25,0x73,0x20,0x2e,0x2e,0x2e,0x20,0x0a,0x73,0x6c,0x65,0x65,0x70,0x22, + 0x44,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x3a,0x20,0x43,0x6f,0x6e,0x6e,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x20,0x73,0x75,0x63,0x63,0x65,0x65,0x64,0x2e,0x0c,0x63,0x6f, + 0x6e,0x6e,0x65,0x63,0x74,0x2e,0x44,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x3a,0x20, + 0x54,0x72,0x79,0x69,0x6e,0x67,0x20,0x74,0x6f,0x20,0x63,0x6f,0x6e,0x6e,0x65,0x63, + 0x74,0x20,0x74,0x6f,0x20,0x25,0x73,0x3a,0x25,0x73,0x20,0x2e,0x2e,0x2e,0x20,0x11, + 0x44,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x20,0x76,0x25,0x73,0x0b,0x66,0x6f,0x72, + 0x6d,0x61,0x74,0x0b,0x73,0x74,0x72,0x69,0x6e,0x67,0x0a,0x70,0x72,0x69,0x6e,0x74, + 0x0f,0x73,0x65,0x74,0x74,0x69,0x6d,0x65,0x6f,0x75,0x74,0x0b,0x63,0x72,0x65,0x61, + 0x74,0x65,0x0b,0x61,0x73,0x73,0x65,0x72,0x74,0x0a,0x75,0x6e,0x62,0x36,0x34,0x0b, + 0x72,0x61,0x77,0x62,0x36,0x34,0x08,0x62,0x36,0x34,0x0c,0x72,0x65,0x71,0x75,0x69, + 0x72,0x65,0x21,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x74,0x72,0x61,0x6e, + 0x73,0x70,0x6f,0x72,0x74,0x2e,0x6c,0x75,0x61,0x73,0x6f,0x63,0x6b,0x65,0x74,0x13, + 0x44,0x42,0x47,0x50,0x5f,0x54,0x52,0x41,0x4e,0x53,0x50,0x4f,0x52,0x54,0x09,0x69, + 0x6e,0x69,0x74,0x14,0x44,0x42,0x47,0x50,0x5f,0x57,0x4f,0x52,0x4b,0x49,0x4e,0x47, + 0x44,0x49,0x52,0x12,0x44,0x42,0x47,0x50,0x5f,0x50,0x4c,0x41,0x54,0x46,0x4f,0x52, + 0x4d,0x0e,0x6c,0x75,0x61,0x69,0x64,0x65,0x6b,0x65,0x79,0x10,0x44,0x42,0x47,0x50, + 0x5f,0x49,0x44,0x45,0x4b,0x45,0x59,0x0a,0x31,0x30,0x30,0x30,0x30,0x11,0x44,0x42, + 0x47,0x50,0x5f,0x49,0x44,0x45,0x50,0x4f,0x52,0x54,0x0e,0x31,0x32,0x37,0x2e,0x30, + 0x2e,0x30,0x2e,0x31,0x11,0x44,0x42,0x47,0x50,0x5f,0x49,0x44,0x45,0x48,0x4f,0x53, + 0x54,0x0b,0x67,0x65,0x74,0x65,0x6e,0x76,0x07,0x6f,0x73,0x01,0x80,0x80,0x80,0xff, + 0x03,0xee,0x0d,0x03,0x00,0x20,0x00,0x7b,0x00,0xea,0x01,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x03,0x00,0x3a,0x01,0x02,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x05,0x00,0x3a,0x01,0x04,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x07,0x00,0x3a,0x01,0x06,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x09,0x00,0x3a,0x01,0x08,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x0b,0x00,0x3a,0x01,0x0a,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x0d,0x00,0x3a,0x01,0x0c,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x0f,0x00,0x3a,0x01,0x0e,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x11,0x00,0x3a,0x01,0x10,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x13,0x00,0x3a,0x01,0x12,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x15,0x00,0x3a,0x01,0x14,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x17,0x00,0x3a,0x01,0x16,0x00,0x34,0x00,0x00,0x00,0x37, + 0x00,0x01,0x00,0x31,0x01,0x19,0x00,0x3a,0x01,0x18,0x00,0x25,0x00,0x1a,0x00,0x34, + 0x01,0x1b,0x00,0x25,0x02,0x1c,0x00,0x3e,0x01,0x02,0x02,0x32,0x02,0x00,0x00,0x34, + 0x03,0x00,0x00,0x37,0x03,0x1d,0x03,0x3a,0x02,0x1e,0x03,0x34,0x03,0x1b,0x00,0x25, + 0x04,0x16,0x00,0x3e,0x03,0x02,0x02,0x34,0x04,0x1b,0x00,0x25,0x05,0x14,0x00,0x3e, + 0x04,0x02,0x02,0x34,0x05,0x1b,0x00,0x25,0x06,0x0c,0x00,0x3e,0x05,0x02,0x02,0x34, + 0x06,0x1b,0x00,0x25,0x07,0x08,0x00,0x3e,0x06,0x02,0x02,0x34,0x07,0x1b,0x00,0x25, + 0x08,0x0a,0x00,0x3e,0x07,0x02,0x02,0x34,0x08,0x1b,0x00,0x25,0x09,0x18,0x00,0x3e, + 0x08,0x02,0x02,0x37,0x09,0x1f,0x03,0x34,0x0a,0x20,0x00,0x37,0x0a,0x21,0x0a,0x34, + 0x0b,0x20,0x00,0x37,0x0b,0x22,0x0b,0x34,0x0c,0x20,0x00,0x37,0x0c,0x23,0x0c,0x34, + 0x0d,0x20,0x00,0x37,0x0d,0x24,0x0d,0x34,0x0e,0x20,0x00,0x37,0x0e,0x25,0x0e,0x34, + 0x0f,0x20,0x00,0x37,0x0f,0x26,0x0f,0x2a,0x10,0x12,0x00,0x33,0x13,0x28,0x00,0x34, + 0x14,0x29,0x00,0x32,0x15,0x00,0x00,0x33,0x16,0x2a,0x00,0x3e,0x14,0x03,0x02,0x3a, + 0x14,0x2b,0x13,0x34,0x14,0x29,0x00,0x32,0x15,0x00,0x00,0x33,0x16,0x2c,0x00,0x3e, + 0x14,0x03,0x02,0x3a,0x14,0x2d,0x13,0x3a,0x13,0x27,0x02,0x29,0x13,0x00,0x00,0x34, + 0x14,0x2e,0x00,0x07,0x14,0x2f,0x00,0x54,0x14,0x03,0x80,0x34,0x14,0x30,0x00,0x10, + 0x13,0x14,0x00,0x54,0x14,0x0b,0x80,0x34,0x14,0x2e,0x00,0x07,0x14,0x31,0x00,0x54, + 0x14,0x03,0x80,0x37,0x14,0x32,0x01,0x31,0x13,0x33,0x00,0x30,0x14,0x05,0x80,0x34, + 0x14,0x34,0x00,0x34,0x15,0x2e,0x00,0x25,0x16,0x35,0x00,0x24,0x15,0x16,0x15,0x3e, + 0x14,0x02,0x01,0x34,0x14,0x36,0x00,0x33,0x15,0x39,0x00,0x34,0x16,0x36,0x00,0x37, + 0x16,0x38,0x16,0x3a,0x16,0x38,0x15,0x34,0x16,0x36,0x00,0x37,0x16,0x3a,0x16,0x3a, + 0x16,0x3a,0x15,0x34,0x16,0x36,0x00,0x37,0x16,0x3b,0x16,0x3a,0x16,0x3b,0x15,0x34, + 0x16,0x36,0x00,0x37,0x16,0x3c,0x16,0x3a,0x16,0x3c,0x15,0x3a,0x15,0x37,0x14,0x34, + 0x14,0x36,0x00,0x31,0x15,0x3d,0x00,0x3a,0x15,0x38,0x14,0x31,0x14,0x3e,0x00,0x33, + 0x15,0x41,0x00,0x31,0x16,0x40,0x00,0x3a,0x16,0x42,0x15,0x3a,0x14,0x43,0x15,0x3a, + 0x14,0x44,0x15,0x3a,0x14,0x45,0x15,0x3a,0x14,0x46,0x15,0x3a,0x15,0x3f,0x02,0x37, + 0x15,0x3f,0x02,0x37,0x16,0x3f,0x02,0x3a,0x16,0x47,0x15,0x33,0x15,0x4a,0x00,0x31, + 0x16,0x49,0x00,0x3a,0x16,0x42,0x15,0x31,0x16,0x4b,0x00,0x3a,0x16,0x43,0x15,0x31, + 0x16,0x4c,0x00,0x3a,0x16,0x44,0x15,0x31,0x16,0x4d,0x00,0x3a,0x16,0x45,0x15,0x31, + 0x16,0x4e,0x00,0x3a,0x16,0x46,0x15,0x3a,0x15,0x48,0x02,0x37,0x15,0x48,0x02,0x37, + 0x16,0x48,0x02,0x3a,0x16,0x47,0x15,0x34,0x15,0x29,0x00,0x32,0x16,0x00,0x00,0x33, + 0x17,0x4f,0x00,0x3e,0x15,0x03,0x02,0x33,0x16,0x58,0x00,0x33,0x17,0x52,0x00,0x31, + 0x18,0x51,0x00,0x3a,0x18,0x53,0x17,0x31,0x18,0x54,0x00,0x3a,0x18,0x55,0x17,0x31, + 0x18,0x56,0x00,0x3a,0x18,0x57,0x17,0x3a,0x17,0x59,0x16,0x3a,0x16,0x50,0x02,0x32, + 0x16,0x00,0x00,0x3a,0x16,0x5a,0x02,0x32,0x16,0x00,0x00,0x32,0x17,0x00,0x00,0x32, + 0x18,0x00,0x00,0x29,0x19,0x00,0x00,0x27,0x1a,0x00,0x00,0x32,0x1b,0x00,0x00,0x31, + 0x1c,0x5b,0x00,0x31,0x1d,0x5c,0x00,0x37,0x1e,0x50,0x02,0x31,0x1f,0x5e,0x00,0x3a, + 0x1f,0x5d,0x1e,0x37,0x1e,0x50,0x02,0x31,0x1f,0x60,0x00,0x3a,0x1f,0x5f,0x1e,0x37, + 0x1e,0x50,0x02,0x31,0x1f,0x62,0x00,0x3a,0x1f,0x61,0x1e,0x37,0x1e,0x50,0x02,0x31, + 0x1f,0x64,0x00,0x3a,0x1f,0x63,0x1e,0x37,0x1e,0x50,0x02,0x31,0x1f,0x66,0x00,0x3a, + 0x1f,0x65,0x1e,0x37,0x1e,0x50,0x02,0x31,0x1f,0x68,0x00,0x3a,0x1f,0x67,0x1e,0x37, + 0x1e,0x5a,0x02,0x31,0x1f,0x6a,0x00,0x3a,0x1f,0x69,0x1e,0x37,0x1e,0x5a,0x02,0x31, + 0x1f,0x6c,0x00,0x3a,0x1f,0x6b,0x1e,0x37,0x1e,0x5a,0x02,0x31,0x1f,0x6e,0x00,0x3a, + 0x1f,0x6d,0x1e,0x30,0x16,0x00,0x80,0x31,0x16,0x70,0x00,0x3a,0x16,0x6f,0x02,0x31, + 0x16,0x71,0x00,0x31,0x17,0x72,0x00,0x31,0x18,0x73,0x00,0x10,0x19,0x0b,0x00,0x31, + 0x1a,0x74,0x00,0x3e,0x19,0x02,0x02,0x31,0x1a,0x75,0x00,0x34,0x1b,0x76,0x00,0x34, + 0x1c,0x77,0x00,0x25,0x1d,0x78,0x00,0x3e,0x1b,0x03,0x02,0x0f,0x00,0x1b,0x00,0x54, + 0x1c,0x01,0x80,0x31,0x1a,0x79,0x00,0x31,0x1b,0x7a,0x00,0x30,0x00,0x00,0x80,0x48, + 0x1b,0x02,0x00,0x00,0x00,0x08,0x6a,0x69,0x74,0x07,0x5f,0x47,0x0b,0x72,0x61,0x77, + 0x67,0x65,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x1e,0x70,0x72,0x65,0x76,0x69,0x6f, + 0x75,0x73,0x5f,0x63,0x6f,0x6e,0x74,0x65,0x78,0x74,0x5f,0x72,0x65,0x73,0x70,0x6f, + 0x6e,0x73,0x65,0x00,0x0c,0x64,0x69,0x73,0x63,0x61,0x72,0x64,0x00,0x0f,0x64,0x6f, + 0x65,0x73,0x5f,0x6d,0x61,0x74,0x63,0x68,0x00,0x0d,0x72,0x65,0x67,0x69,0x73,0x74, + 0x65,0x72,0x00,0x0c,0x67,0x65,0x74,0x5f,0x78,0x6d,0x6c,0x00,0x0b,0x72,0x65,0x6d, + 0x6f,0x76,0x65,0x00,0x08,0x67,0x65,0x74,0x00,0x07,0x61,0x74,0x00,0x0b,0x69,0x6e, + 0x73,0x65,0x72,0x74,0x00,0x0a,0x67,0x75,0x65,0x73,0x73,0x00,0x00,0x0b,0x65,0x76, + 0x65,0x6e,0x74,0x73,0x13,0x68,0x69,0x74,0x5f,0x63,0x6f,0x6e,0x64,0x69,0x74,0x69, + 0x6f,0x6e,0x73,0x01,0x00,0x00,0x06,0x25,0x00,0x07,0x3d,0x3d,0x00,0x07,0x3e,0x3d, + 0x01,0x00,0x00,0x00,0x10,0x62,0x72,0x65,0x61,0x6b,0x70,0x6f,0x69,0x6e,0x74,0x73, + 0x01,0x00,0x01,0x0b,0x5f,0x5f,0x6d,0x6f,0x64,0x65,0x06,0x6b,0x00,0x00,0x00,0x00, + 0x01,0x00,0x00,0x00,0x10,0x63,0x6f,0x70,0x79,0x5f,0x6f,0x75,0x74,0x70,0x75,0x74, + 0x0c,0x5f,0x5f,0x69,0x6e,0x64,0x65,0x78,0x09,0x73,0x65,0x65,0x6b,0x0c,0x73,0x65, + 0x74,0x76,0x62,0x75,0x66,0x0a,0x63,0x6c,0x6f,0x73,0x65,0x0a,0x66,0x6c,0x75,0x73, + 0x68,0x0a,0x77,0x72,0x69,0x74,0x65,0x01,0x00,0x00,0x00,0x14,0x72,0x65,0x64,0x69, + 0x72,0x65,0x63,0x74,0x5f,0x6f,0x75,0x74,0x70,0x75,0x74,0x00,0x00,0x0b,0x73,0x74, + 0x64,0x65,0x72,0x72,0x0b,0x73,0x74,0x64,0x6f,0x75,0x74,0x0a,0x73,0x74,0x64,0x69, + 0x6e,0x01,0x00,0x00,0x0b,0x6f,0x75,0x74,0x70,0x75,0x74,0x09,0x62,0x61,0x73,0x65, + 0x07,0x69,0x6f,0x16,0x69,0x73,0x20,0x6e,0x6f,0x74,0x20,0x73,0x75,0x70,0x70,0x6f, + 0x72,0x74,0x65,0x64,0x2e,0x0a,0x65,0x72,0x72,0x6f,0x72,0x00,0x0f,0x73,0x65,0x74, + 0x75,0x70,0x76,0x61,0x6c,0x75,0x65,0x0c,0x4c,0x75,0x61,0x20,0x35,0x2e,0x32,0x0c, + 0x73,0x65,0x74,0x66,0x65,0x6e,0x76,0x0c,0x4c,0x75,0x61,0x20,0x35,0x2e,0x31,0x0d, + 0x5f,0x56,0x45,0x52,0x53,0x49,0x4f,0x4e,0x0e,0x66,0x72,0x6f,0x6d,0x5f,0x63,0x6f, + 0x72,0x6f,0x01,0x00,0x01,0x0b,0x5f,0x5f,0x6d,0x6f,0x64,0x65,0x06,0x6b,0x0c,0x66, + 0x72,0x6f,0x6d,0x5f,0x69,0x64,0x01,0x00,0x01,0x0b,0x5f,0x5f,0x6d,0x6f,0x64,0x65, + 0x06,0x76,0x11,0x73,0x65,0x74,0x6d,0x65,0x74,0x61,0x74,0x61,0x62,0x6c,0x65,0x01, + 0x00,0x01,0x06,0x6e,0x03,0x00,0x16,0x61,0x63,0x74,0x69,0x76,0x65,0x5f,0x63,0x6f, + 0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x73,0x0b,0x73,0x74,0x61,0x74,0x75,0x73,0x0b, + 0x72,0x65,0x73,0x75,0x6d,0x65,0x0a,0x79,0x69,0x65,0x6c,0x64,0x09,0x77,0x72,0x61, + 0x70,0x0b,0x63,0x72,0x65,0x61,0x74,0x65,0x0c,0x72,0x75,0x6e,0x6e,0x69,0x6e,0x67, + 0x0e,0x63,0x6f,0x72,0x6f,0x75,0x74,0x69,0x6e,0x65,0x08,0x6c,0x6f,0x67,0x12,0x64, + 0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x63,0x6f,0x72,0x65,0x0b,0x6c,0x6f,0x61, + 0x64,0x65,0x64,0x0a,0x64,0x65,0x62,0x75,0x67,0x0c,0x72,0x65,0x71,0x75,0x69,0x72, + 0x65,0x0a,0x31,0x2e,0x31,0x2e,0x30,0x00,0x11,0x64,0x65,0x62,0x75,0x67,0x67,0x65, + 0x72,0x2e,0x75,0x72,0x6c,0x00,0x12,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e, + 0x75,0x74,0x69,0x6c,0x00,0x16,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x70, + 0x6c,0x61,0x74,0x66,0x6f,0x72,0x6d,0x00,0x21,0x64,0x65,0x62,0x75,0x67,0x67,0x65, + 0x72,0x2e,0x70,0x6c,0x75,0x67,0x69,0x6e,0x73,0x2e,0x66,0x66,0x69,0x2e,0x72,0x65, + 0x66,0x6c,0x65,0x63,0x74,0x00,0x19,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e, + 0x70,0x6c,0x75,0x67,0x69,0x6e,0x73,0x2e,0x66,0x66,0x69,0x00,0x1b,0x64,0x65,0x62, + 0x75,0x67,0x67,0x65,0x72,0x2e,0x69,0x6e,0x74,0x72,0x6f,0x73,0x70,0x65,0x63,0x74, + 0x69,0x6f,0x6e,0x00,0x12,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x64,0x62, + 0x67,0x70,0x00,0x15,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x63,0x6f,0x6e, + 0x74,0x65,0x78,0x74,0x00,0x16,0x64,0x65,0x62,0x75,0x67,0x67,0x65,0x72,0x2e,0x63, + 0x6f,0x6d,0x6d,0x61,0x6e,0x64,0x73,0x00,0x27,0x64,0x65,0x62,0x75,0x67,0x67,0x65, + 0x72,0x2e,0x74,0x72,0x61,0x6e,0x73,0x70,0x6f,0x72,0x74,0x2e,0x6c,0x75,0x61,0x73, + 0x6f,0x63,0x6b,0x65,0x74,0x5f,0x73,0x63,0x68,0x65,0x64,0x00,0x21,0x64,0x65,0x62, 0x75,0x67,0x67,0x65,0x72,0x2e,0x74,0x72,0x61,0x6e,0x73,0x70,0x6f,0x72,0x74,0x2e, - 0x61,0x70,0x72,0x0c,0x70,0x72,0x65,0x6c,0x6f,0x61,0x64,0x0c,0x70,0x61,0x63,0x6b, - 0x61,0x67,0x65,0x00, + 0x6c,0x75,0x61,0x73,0x6f,0x63,0x6b,0x65,0x74,0x00,0x1b,0x64,0x65,0x62,0x75,0x67, + 0x67,0x65,0x72,0x2e,0x74,0x72,0x61,0x6e,0x73,0x70,0x6f,0x72,0x74,0x2e,0x61,0x70, + 0x72,0x0c,0x70,0x72,0x65,0x6c,0x6f,0x61,0x64,0x0c,0x70,0x61,0x63,0x6b,0x61,0x67, + 0x65,0x00, }; diff --git a/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp b/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp index 871c9f24b1..14b48ddd17 100644 --- a/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp +++ b/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp @@ -1,6 +1,6 @@ #include "CCLuaJavaBridge.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #define LOG_TAG "luajc" diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index ed02f45ec4..3f682c84da 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -926,7 +926,7 @@ "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; }; name = Debug; }; @@ -950,7 +950,7 @@ "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; }; name = Release; }; @@ -970,7 +970,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac"; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; }; name = Debug; }; @@ -990,7 +990,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac"; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; }; name = Release; }; diff --git a/download-deps.py b/download-deps.py index d82489f6b0..994c942f86 100755 --- a/download-deps.py +++ b/download-deps.py @@ -68,7 +68,7 @@ class CocosZipInstaller(object): self._url = data["repo_parent"] + self._repo_name + '/archive/' + self._filename self._zip_file_size = int(data["zip_file_size"]) # 'v' letter was swallowed by github, so we need to substring it from the 2nd letter - self._extracted_folder_name = self._repo_name + '-' + self._current_version[1:] + self._extracted_folder_name = os.path.join(self._workpath, self._repo_name + '-' + self._current_version[1:]) try: data = self.load_json_file(version_path) @@ -291,8 +291,9 @@ def main(): print("=======================================================") print("==> Prepare to download external libraries!") + external_path = os.path.join(workpath, 'external') installer = CocosZipInstaller(workpath, os.path.join(workpath, 'external', 'config.json'), os.path.join(workpath, 'external', 'version.json'), "prebuilt_libs_version") - installer.run("external", opts.remove_downloaded, opts.force_update, opts.download_only) + installer.run(external_path, opts.remove_downloaded, opts.force_update, opts.download_only) print("=======================================================") print("==> Prepare to download lua runtime binaries") diff --git a/extensions/GUI/CCControlExtension/CCControlButton.cpp b/extensions/GUI/CCControlExtension/CCControlButton.cpp index 69617309c0..ff618a8ac2 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.cpp +++ b/extensions/GUI/CCControlExtension/CCControlButton.cpp @@ -656,30 +656,32 @@ void ControlButton::onTouchEnded(Touch *pTouch, Event *pEvent) void ControlButton::setOpacity(GLubyte opacity) { - // XXX fixed me if not correct Control::setOpacity(opacity); -// _opacity = opacity; -// -// Ref* child; -// Array* children=getChildren(); -// CCARRAY_FOREACH(children, child) -// { -// RGBAProtocol* pNode = dynamic_cast(child); -// if (pNode) -// { -// pNode->setOpacity(opacity); -// } -// } for (auto iter = _backgroundSpriteDispatchTable.begin(); iter != _backgroundSpriteDispatchTable.end(); ++iter) { iter->second->setOpacity(opacity); } + + for (auto iter = _titleLabelDispatchTable.begin(); iter != _titleLabelDispatchTable.end(); ++iter) + { + iter->second->setOpacity(opacity); + } } -GLubyte ControlButton::getOpacity() const +void ControlButton::updateDisplayedOpacity(GLubyte parentOpacity) { - return _realOpacity; + Control::updateDisplayedOpacity(parentOpacity); + + for (auto iter = _backgroundSpriteDispatchTable.begin(); iter != _backgroundSpriteDispatchTable.end(); ++iter) + { + iter->second->updateDisplayedOpacity(parentOpacity); + } + + for (auto iter = _titleLabelDispatchTable.begin(); iter != _titleLabelDispatchTable.end(); ++iter) + { + iter->second->updateDisplayedOpacity(parentOpacity); + } } void ControlButton::setColor(const Color3B & color) @@ -690,11 +692,26 @@ void ControlButton::setColor(const Color3B & color) { iter->second->setColor(color); } + + for (auto iter = _titleLabelDispatchTable.begin(); iter != _titleLabelDispatchTable.end(); ++iter) + { + iter->second->setColor(color); + } } -const Color3B& ControlButton::getColor() const +void ControlButton::updateDisplayedColor(const Color3B& parentColor) { - return _realColor; + Control::updateDisplayedColor(parentColor); + + for (auto iter = _backgroundSpriteDispatchTable.begin(); iter != _backgroundSpriteDispatchTable.end(); ++iter) + { + iter->second->updateDisplayedColor(parentColor); + } + + for (auto iter = _titleLabelDispatchTable.begin(); iter != _titleLabelDispatchTable.end(); ++iter) + { + iter->second->updateDisplayedColor(parentColor); + } } void ControlButton::onTouchCancelled(Touch *pTouch, Event *pEvent) diff --git a/extensions/GUI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h index f471cc039c..cd73e63c5a 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.h +++ b/extensions/GUI/CCControlExtension/CCControlButton.h @@ -181,11 +181,11 @@ public: virtual void onTouchMoved(Touch *touch, Event *event) override; virtual void onTouchEnded(Touch *touch, Event *event) override; virtual void onTouchCancelled(Touch *touch, Event *event) override; - virtual GLubyte getOpacity(void) const override; - virtual void setOpacity(GLubyte var) override; - virtual const Color3B& getColor(void) const override; - virtual void setColor(const Color3B&) override; + virtual void setOpacity(GLubyte var) override; + virtual void updateDisplayedOpacity(GLubyte parentOpacity) override; + virtual void setColor(const Color3B&) override; + virtual void updateDisplayedColor(const Color3B& parentColor) override; const std::string& getCurrentTitle() const { return _currentTitle; }; std::string getCurrentTitle() { return _currentTitle; }; diff --git a/extensions/GUI/CCEditBox/CCEditBox.h b/extensions/GUI/CCEditBox/CCEditBox.h index d666528d18..5b627ef498 100644 --- a/extensions/GUI/CCEditBox/CCEditBox.h +++ b/extensions/GUI/CCEditBox/CCEditBox.h @@ -26,7 +26,7 @@ #ifndef __CCEDITTEXT_H__ #define __CCEDITTEXT_H__ -#include "2d/CCIMEDelegate.h" +#include "base/CCIMEDelegate.h" #include "extensions/ExtensionMacros.h" #include "../CCControlExtension/CCControlExtensions.h" diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h index cbb0a9a00b..a5b93c4f58 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h @@ -36,21 +36,16 @@ #include "extensions/ExtensionMacros.h" #include "CCEditBoxImpl.h" -@interface CCCustomNSTextField : NSTextField -{ -} - -@end @interface CCEditBoxImplMac : NSObject { - CCCustomNSTextField* textField_; void* editBox_; BOOL editState_; NSMutableDictionary* placeholderAttributes_; } @property(nonatomic, retain) NSTextField* textField; +@property(nonatomic, retain) NSSecureTextField* secureTextField; @property(nonatomic, retain) NSMutableDictionary* placeholderAttributes; @property(nonatomic, readonly, getter = isEditState) BOOL editState; @property(nonatomic, assign) void* editBox; diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm index dfc3b6d0d0..fbeed2ee37 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm @@ -38,29 +38,10 @@ -@implementation CCCustomNSTextField - -- (CGRect)textRectForBounds:(CGRect)bounds { - float padding = 5.0f; - return CGRectMake(bounds.origin.x + padding, bounds.origin.y + padding, - bounds.size.width - padding*2, bounds.size.height - padding*2); -} -- (CGRect)editingRectForBounds:(CGRect)bounds { - return [self textRectForBounds:bounds]; -} - -- (void)setup { - [self setBordered:NO]; - [self setHidden:NO]; - [self setWantsLayer:YES]; -} - -@end - - @implementation CCEditBoxImplMac @synthesize textField = textField_; +@synthesize secureTextField = secureTextField_; @synthesize placeholderAttributes = placeholderAttributes_; @synthesize editState = editState_; @synthesize editBox = editBox_; @@ -75,7 +56,12 @@ { [textField_ resignFirstResponder]; [textField_ removeFromSuperview]; - self.textField = NULL; + [textField_ release]; + + [secureTextField_ resignFirstResponder]; + [secureTextField_ removeFromSuperview]; + [secureTextField_ release]; + [placeholderAttributes_ release]; [super dealloc]; } @@ -84,18 +70,19 @@ { self = [super init]; - do + if (self) { - if (self == nil) break; editState_ = NO; - self.textField = [[[CCCustomNSTextField alloc] initWithFrame: frameRect] autorelease]; - if (!textField_) break; + self.textField = [[[NSTextField alloc] initWithFrame:frameRect] autorelease]; + self.secureTextField = [[[NSSecureTextField alloc] initWithFrame:frameRect] autorelease]; + NSFont *font = [NSFont systemFontOfSize:frameRect.size.height*2/3]; //TODO need to delete hard code here. - textField_.textColor = [NSColor whiteColor]; textField_.font = font; - textField_.backgroundColor = [NSColor clearColor]; - [textField_ setup]; - textField_.delegate = self; + secureTextField_.font = font; + + [self setupTextField:textField_]; + [self setupTextField:secureTextField_]; + self.editBox = editBox; self.placeholderAttributes = [NSMutableDictionary dictionaryWithObjectsAndKeys: font, NSFontAttributeName, @@ -103,11 +90,19 @@ nil]; [[[self getNSWindow] contentView] addSubview:textField_]; - - return self; - }while(0); + } - return nil; + return self; +} + +- (void)setupTextField:(NSTextField *)textField +{ + [textField setTextColor:[NSColor whiteColor]]; + [textField setBackgroundColor:[NSColor clearColor]]; + [textField setBordered:NO]; + [textField setHidden:NO]; + [textField setWantsLayer:YES]; + [textField setDelegate:self]; } -(void) doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)distance @@ -120,6 +115,7 @@ NSRect frame = [textField_ frame]; frame.origin = pos; [textField_ setFrame:frame]; + [secureTextField_ setFrame:frame]; } -(void) setContentSize:(NSSize) size @@ -134,18 +130,29 @@ -(void) openKeyboard { - [textField_ becomeFirstResponder]; + if ([textField_ superview]) { + [textField_ becomeFirstResponder]; + } + else { + [secureTextField_ becomeFirstResponder]; + } } -(void) closeKeyboard { - [textField_ resignFirstResponder]; - [textField_ removeFromSuperview]; + if ([textField_ superview]) { + [textField_ resignFirstResponder]; + [textField_ removeFromSuperview]; + } + else { + [secureTextField_ resignFirstResponder]; + [secureTextField_ removeFromSuperview]; + } } - (BOOL)textFieldShouldReturn:(NSTextField *)sender { - if (sender == textField_) { + if (sender == textField_ || sender == secureTextField_) { [sender resignFirstResponder]; } return NO; @@ -301,8 +308,10 @@ void EditBoxImplMac::setFont(const char* pFontName, int fontSize) { NSString * fntName = [NSString stringWithUTF8String:pFontName]; NSFont *textFont = [NSFont fontWithName:fntName size:fontSize]; - if(textFont != nil) + if (textFont != nil) { [_sysEdit.textField setFont:textFont]; + [_sysEdit.secureTextField setFont:textFont]; + } } void EditBoxImplMac::setPlaceholderFont(const char* pFontName, int fontSize) @@ -326,7 +335,9 @@ void EditBoxImplMac::setPlaceholderFont(const char* pFontName, int fontSize) void EditBoxImplMac::setFontColor(const Color3B& color) { - _sysEdit.textField.textColor = [NSColor colorWithCalibratedRed:color.r / 255.0f green:color.g / 255.0f blue:color.b / 255.0f alpha:1.0f]; + NSColor *newColor = [NSColor colorWithCalibratedRed:color.r / 255.0f green:color.g / 255.0f blue:color.b / 255.0f alpha:1.0f]; + _sysEdit.textField.textColor = newColor; + _sysEdit.secureTextField.textColor = newColor; } void EditBoxImplMac::setPlaceholderFontColor(const Color3B& color) @@ -357,7 +368,27 @@ int EditBoxImplMac::getMaxLength() void EditBoxImplMac::setInputFlag(EditBox::InputFlag inputFlag) { - // TODO: NSSecureTextField + switch (inputFlag) + { + case EditBox::InputFlag::PASSWORD: + [_sysEdit.textField.superview addSubview:_sysEdit.secureTextField]; + [_sysEdit.textField removeFromSuperview]; + break; + case EditBox::InputFlag::INITIAL_CAPS_WORD: + CCLOGWARN("INITIAL_CAPS_WORD not implemented"); + break; + case EditBox::InputFlag::INITIAL_CAPS_SENTENCE: + CCLOGWARN("INITIAL_CAPS_SENTENCE not implemented"); + break; + case EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS: + CCLOGWARN("INTIAL_CAPS_ALL_CHARACTERS not implemented"); + break; + case EditBox::InputFlag::SENSITIVE: + CCLOGWARN("SENSITIVE not implemented"); + break; + default: + break; + } } void EditBoxImplMac::setReturnType(EditBox::KeyboardReturnType returnType) @@ -371,7 +402,9 @@ bool EditBoxImplMac::isEditing() void EditBoxImplMac::setText(const char* pText) { - _sysEdit.textField.stringValue = [NSString stringWithUTF8String:pText]; + NSString *string = [NSString stringWithUTF8String:pText]; + _sysEdit.textField.stringValue = string; + _sysEdit.textField.stringValue = string; } const char* EditBoxImplMac::getText(void) @@ -385,6 +418,7 @@ void EditBoxImplMac::setPlaceHolder(const char* pText) attributes:_sysEdit.placeholderAttributes]; [[_sysEdit.textField cell] setPlaceholderAttributedString:as]; + [[_sysEdit.secureTextField cell] setPlaceholderAttributedString:as]; [as release]; } @@ -438,6 +472,7 @@ void EditBoxImplMac::setPosition(const Vec2& pos) void EditBoxImplMac::setVisible(bool visible) { [_sysEdit.textField setHidden:!visible]; + [_sysEdit.secureTextField setHidden:!visible]; } void EditBoxImplMac::setContentSize(const Size& size) diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp index e43d85d746..5cef5fd0b8 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp @@ -25,8 +25,8 @@ THE SOFTWARE. #include "CCEditBoxImplWp8.h" #include "CCEditBox.h" #include "CCGLView.h" -#include "CCScriptSupport.h" -#include "ccUTF8.h" +#include "base/CCScriptSupport.h" +#include "base/ccUTF8.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp index 020b775a92..f025eea458 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.cpp +++ b/extensions/GUI/CCScrollView/CCScrollView.cpp @@ -25,7 +25,7 @@ #include "CCScrollView.h" #include "CCGLView.h" -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include "2d/CCActionInstant.h" #include "2d/CCActionInterval.h" #include "2d/CCActionTween.h" diff --git a/extensions/GUI/CCScrollView/CCTableViewCell.cpp b/extensions/GUI/CCScrollView/CCTableViewCell.cpp index 8965bb036b..3222775cbb 100644 --- a/extensions/GUI/CCScrollView/CCTableViewCell.cpp +++ b/extensions/GUI/CCScrollView/CCTableViewCell.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "CCTableViewCell.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" NS_CC_EXT_BEGIN diff --git a/plugin b/plugin index af2b48206a..96dc74898f 160000 --- a/plugin +++ b/plugin @@ -1 +1 @@ -Subproject commit af2b48206acfe005e370702272dbd02495806630 +Subproject commit 96dc74898fcc1be55a68dc404d65067fd337b863 diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 6d263bef04..da6b76ab1c 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -107,9 +107,6 @@ "cocos/2d/CCGrabber.h", "cocos/2d/CCGrid.cpp", "cocos/2d/CCGrid.h", - "cocos/2d/CCIMEDelegate.h", - "cocos/2d/CCIMEDispatcher.cpp", - "cocos/2d/CCIMEDispatcher.h", "cocos/2d/CCLabel.cpp", "cocos/2d/CCLabel.h", "cocos/2d/CCLabelAtlas.cpp", @@ -144,13 +141,10 @@ "cocos/2d/CCParticleSystemQuad.h", "cocos/2d/CCProgressTimer.cpp", "cocos/2d/CCProgressTimer.h", - "cocos/2d/CCProtocols.h", "cocos/2d/CCRenderTexture.cpp", "cocos/2d/CCRenderTexture.h", "cocos/2d/CCScene.cpp", "cocos/2d/CCScene.h", - "cocos/2d/CCScriptSupport.cpp", - "cocos/2d/CCScriptSupport.h", "cocos/2d/CCSprite.cpp", "cocos/2d/CCSprite.h", "cocos/2d/CCSpriteBatchNode.cpp", @@ -169,12 +163,6 @@ "cocos/2d/CCTMXXMLParser.h", "cocos/2d/CCTextFieldTTF.cpp", "cocos/2d/CCTextFieldTTF.h", - "cocos/2d/CCTexture2D.cpp", - "cocos/2d/CCTexture2D.h", - "cocos/2d/CCTextureAtlas.cpp", - "cocos/2d/CCTextureAtlas.h", - "cocos/2d/CCTextureCache.cpp", - "cocos/2d/CCTextureCache.h", "cocos/2d/CCTileMapAtlas.cpp", "cocos/2d/CCTileMapAtlas.h", "cocos/2d/CCTransition.cpp", @@ -185,23 +173,7 @@ "cocos/2d/CCTransitionProgress.h", "cocos/2d/CCTweenFunction.cpp", "cocos/2d/CCTweenFunction.h", - "cocos/2d/CCUserDefault.cpp", - "cocos/2d/CCUserDefault.h", - "cocos/2d/CCUserDefault.mm", - "cocos/2d/CCUserDefaultAndroid.cpp", - "cocos/2d/CCVertex.cpp", - "cocos/2d/CCVertex.h", "cocos/2d/CMakeLists.txt", - "cocos/2d/TGAlib.cpp", - "cocos/2d/TGAlib.h", - "cocos/2d/ccCArray.cpp", - "cocos/2d/ccCArray.h", - "cocos/2d/ccFPSImages.c", - "cocos/2d/ccFPSImages.h", - "cocos/2d/ccUTF8.cpp", - "cocos/2d/ccUTF8.h", - "cocos/2d/ccUtils.cpp", - "cocos/2d/ccUtils.h", "cocos/2d/cocos2d.vcxproj", "cocos/2d/cocos2d.vcxproj.filters", "cocos/2d/cocos2d_headers.props", @@ -212,191 +184,16 @@ "cocos/2d/cocos2d_wp8.vcxproj", "cocos/2d/cocos2d_wp8.vcxproj.filters", "cocos/2d/cocos2d_wp8_headers.props", - "cocos/2d/cocos2dx-Prefix.pch", "cocos/2d/cocos2dx.props", - "cocos/2d/firePngData.h", - "cocos/2d/platform/CCApplicationProtocol.h", - "cocos/2d/platform/CCCommon.h", - "cocos/2d/platform/CCDevice.h", - "cocos/2d/platform/CCFileUtils.cpp", - "cocos/2d/platform/CCFileUtils.h", - "cocos/2d/platform/CCGLViewProtocol.cpp", - "cocos/2d/platform/CCGLViewProtocol.h", - "cocos/2d/platform/CCImage.cpp", - "cocos/2d/platform/CCImage.h", - "cocos/2d/platform/CCSAXParser.cpp", - "cocos/2d/platform/CCSAXParser.h", - "cocos/2d/platform/CCThread.cpp", - "cocos/2d/platform/CCThread.h", - "cocos/2d/platform/android/Android.mk", - "cocos/2d/platform/android/CCApplication.cpp", - "cocos/2d/platform/android/CCApplication.h", - "cocos/2d/platform/android/CCCommon.cpp", - "cocos/2d/platform/android/CCDevice.cpp", - "cocos/2d/platform/android/CCFileUtilsAndroid.cpp", - "cocos/2d/platform/android/CCFileUtilsAndroid.h", - "cocos/2d/platform/android/CCGL.h", - "cocos/2d/platform/android/CCGLView.cpp", - "cocos/2d/platform/android/CCGLView.h", - "cocos/2d/platform/android/CCPlatformDefine.h", - "cocos/2d/platform/android/CCStdC.h", - "cocos/2d/platform/android/java/.classpath", - "cocos/2d/platform/android/java/.project", - "cocos/2d/platform/android/java/.settings/org.eclipse.jdt.core.prefs", - "cocos/2d/platform/android/java/AndroidManifest.xml", - "cocos/2d/platform/android/java/ant.properties", - "cocos/2d/platform/android/java/build.xml", - "cocos/2d/platform/android/java/proguard-project.txt", - "cocos/2d/platform/android/java/project.properties", - "cocos/2d/platform/android/java/res/", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java", - "cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java", - "cocos/2d/platform/android/javaactivity.cpp", - "cocos/2d/platform/android/jni/DPIJni.cpp", - "cocos/2d/platform/android/jni/DPIJni.h", - "cocos/2d/platform/android/jni/IMEJni.cpp", - "cocos/2d/platform/android/jni/IMEJni.h", - "cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp", - "cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp", - "cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h", - "cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp", - "cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h", - "cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp", - "cocos/2d/platform/android/jni/JniHelper.cpp", - "cocos/2d/platform/android/jni/JniHelper.h", - "cocos/2d/platform/android/jni/TouchesJni.cpp", - "cocos/2d/platform/apple/CCFileUtilsApple.h", - "cocos/2d/platform/apple/CCFileUtilsApple.mm", - "cocos/2d/platform/apple/CCLock.cpp", - "cocos/2d/platform/apple/CCLock.h", - "cocos/2d/platform/apple/CCThread.mm", - "cocos/2d/platform/desktop/CCGLView.cpp", - "cocos/2d/platform/desktop/CCGLView.h", - "cocos/2d/platform/ios/CCApplication.h", - "cocos/2d/platform/ios/CCApplication.mm", - "cocos/2d/platform/ios/CCCommon.mm", - "cocos/2d/platform/ios/CCDevice.mm", - "cocos/2d/platform/ios/CCDirectorCaller.h", - "cocos/2d/platform/ios/CCDirectorCaller.mm", - "cocos/2d/platform/ios/CCEAGLView.h", - "cocos/2d/platform/ios/CCEAGLView.mm", - "cocos/2d/platform/ios/CCES2Renderer.h", - "cocos/2d/platform/ios/CCES2Renderer.m", - "cocos/2d/platform/ios/CCESRenderer.h", - "cocos/2d/platform/ios/CCGL.h", - "cocos/2d/platform/ios/CCGLView.h", - "cocos/2d/platform/ios/CCGLView.mm", - "cocos/2d/platform/ios/CCImage.mm", - "cocos/2d/platform/ios/CCPlatformDefine.h", - "cocos/2d/platform/ios/CCStdC.h", - "cocos/2d/platform/ios/OpenGL_Internal.h", - "cocos/2d/platform/linux/CCApplication.cpp", - "cocos/2d/platform/linux/CCApplication.h", - "cocos/2d/platform/linux/CCCommon.cpp", - "cocos/2d/platform/linux/CCDevice.cpp", - "cocos/2d/platform/linux/CCFileUtilsLinux.cpp", - "cocos/2d/platform/linux/CCFileUtilsLinux.h", - "cocos/2d/platform/linux/CCGL.h", - "cocos/2d/platform/linux/CCPlatformDefine.h", - "cocos/2d/platform/linux/CCStdC.cpp", - "cocos/2d/platform/linux/CCStdC.h", - "cocos/2d/platform/mac/CCApplication.h", - "cocos/2d/platform/mac/CCApplication.mm", - "cocos/2d/platform/mac/CCCommon.mm", - "cocos/2d/platform/mac/CCDevice.mm", - "cocos/2d/platform/mac/CCGL.h", - "cocos/2d/platform/mac/CCPlatformDefine.h", - "cocos/2d/platform/mac/CCStdC.h", - "cocos/2d/platform/win32/CCApplication.cpp", - "cocos/2d/platform/win32/CCApplication.h", - "cocos/2d/platform/win32/CCCommon.cpp", - "cocos/2d/platform/win32/CCDevice.cpp", - "cocos/2d/platform/win32/CCFileUtilsWin32.cpp", - "cocos/2d/platform/win32/CCFileUtilsWin32.h", - "cocos/2d/platform/win32/CCGL.h", - "cocos/2d/platform/win32/CCPlatformDefine.h", - "cocos/2d/platform/win32/CCStdC.cpp", - "cocos/2d/platform/win32/CCStdC.h", - "cocos/2d/platform/win32/compat/stdint.h", - "cocos/2d/platform/winrt/CCApplication.cpp", - "cocos/2d/platform/winrt/CCApplication.h", - "cocos/2d/platform/winrt/CCCommon.cpp", - "cocos/2d/platform/winrt/CCDevice.cpp", - "cocos/2d/platform/winrt/CCFileUtilsWinRT.cpp", - "cocos/2d/platform/winrt/CCFileUtilsWinRT.h", - "cocos/2d/platform/winrt/CCFreeTypeFont.cpp", - "cocos/2d/platform/winrt/CCFreeTypeFont.h", - "cocos/2d/platform/winrt/CCGL.h", - "cocos/2d/platform/winrt/CCGLView.cpp", - "cocos/2d/platform/winrt/CCGLView.h", - "cocos/2d/platform/winrt/CCGL_Angle.h", - "cocos/2d/platform/winrt/CCPThreadWinRT.cpp", - "cocos/2d/platform/winrt/CCPThreadWinRT.h", - "cocos/2d/platform/winrt/CCPlatformDefine.h", - "cocos/2d/platform/winrt/CCPrecompiledShaders.cpp", - "cocos/2d/platform/winrt/CCPrecompiledShaders.h", - "cocos/2d/platform/winrt/CCStdC.cpp", - "cocos/2d/platform/winrt/CCStdC.h", - "cocos/2d/platform/winrt/CCWinRTUtils.cpp", - "cocos/2d/platform/winrt/CCWinRTUtils.h", - "cocos/2d/platform/winrt/DirectXBase.cpp", - "cocos/2d/platform/winrt/DirectXBase.h", - "cocos/2d/platform/winrt/DirectXHelper.h", - "cocos/2d/platform/winrt/InputEvent.cpp", - "cocos/2d/platform/winrt/InputEvent.h", - "cocos/2d/platform/winrt/InputEventTypes.h", - "cocos/2d/platform/winrt/inet_ntop_winrt.cpp", - "cocos/2d/platform/winrt/inet_ntop_winrt.h", - "cocos/2d/platform/winrt/pch.cpp", - "cocos/2d/platform/winrt/pch.h", - "cocos/2d/platform/winrt/sha1.cpp", - "cocos/2d/platform/winrt/sha1.h", - "cocos/2d/platform/winrt/shaders/precompiledshaders.h", - "cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj", - "cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters", - "cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user", - "cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp", - "cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.h", - "cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp", - "cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.h", - "cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.cpp", - "cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.h", - "cocos/2d/platform/wp8-xaml/cpp/DirectXBase.cpp", - "cocos/2d/platform/wp8-xaml/cpp/DirectXBase.h", - "cocos/2d/platform/wp8-xaml/cpp/DirectXHelper.h", - "cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.cpp", - "cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.h", - "cocos/2d/platform/wp8-xaml/xaml/App.xaml", - "cocos/2d/platform/wp8-xaml/xaml/App.xaml.cs", - "cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml", - "cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml.cs", - "cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml", - "cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml.cs", - "cocos/2d/platform/wp8/CCGLView.cpp", - "cocos/2d/platform/wp8/CCGLView.h", - "cocos/2d/platform/wp8/Direct3DBase.cpp", - "cocos/2d/platform/wp8/Direct3DBase.h", - "cocos/2d/platform/wp8/DirectXBase.cpp", - "cocos/2d/platform/wp8/DirectXBase.h", - "cocos/2d/platform/wp8/shaders/precompiledshaders.h", - "cocos/2d/uthash.h", - "cocos/2d/utlist.h", + "cocos/3d/CCMesh.cpp", + "cocos/3d/CCMesh.h", + "cocos/3d/CCObjLoader.cpp", + "cocos/3d/CCObjLoader.h", + "cocos/3d/CCSprite3D.cpp", + "cocos/3d/CCSprite3D.h", + "cocos/3d/CCSprite3DDataCache.cpp", + "cocos/3d/CCSprite3DDataCache.h", + "cocos/3d/CMakeLists.txt", "cocos/Android.mk", "cocos/CMakeLists.txt", "cocos/audio/CMakeLists.txt", @@ -499,6 +296,9 @@ "cocos/base/CCEventTouch.cpp", "cocos/base/CCEventTouch.h", "cocos/base/CCEventType.h", + "cocos/base/CCIMEDelegate.h", + "cocos/base/CCIMEDispatcher.cpp", + "cocos/base/CCIMEDispatcher.h", "cocos/base/CCMap.h", "cocos/base/CCNS.cpp", "cocos/base/CCNS.h", @@ -506,31 +306,52 @@ "cocos/base/CCPlatformMacros.h", "cocos/base/CCProfiling.cpp", "cocos/base/CCProfiling.h", + "cocos/base/CCProtocols.h", "cocos/base/CCRef.cpp", "cocos/base/CCRef.h", "cocos/base/CCRefPtr.h", "cocos/base/CCScheduler.cpp", "cocos/base/CCScheduler.h", + "cocos/base/CCScriptSupport.cpp", + "cocos/base/CCScriptSupport.h", "cocos/base/CCTouch.cpp", "cocos/base/CCTouch.h", + "cocos/base/CCUserDefault.cpp", + "cocos/base/CCUserDefault.h", + "cocos/base/CCUserDefault.mm", + "cocos/base/CCUserDefaultAndroid.cpp", "cocos/base/CCValue.cpp", "cocos/base/CCValue.h", "cocos/base/CCVector.h", "cocos/base/CMakeLists.txt", + "cocos/base/TGAlib.cpp", + "cocos/base/TGAlib.h", "cocos/base/ZipUtils.cpp", "cocos/base/ZipUtils.h", "cocos/base/atitc.cpp", "cocos/base/atitc.h", "cocos/base/base64.cpp", "cocos/base/base64.h", + "cocos/base/ccCArray.cpp", + "cocos/base/ccCArray.h", "cocos/base/ccConfig.h", + "cocos/base/ccFPSImages.c", + "cocos/base/ccFPSImages.h", "cocos/base/ccMacros.h", "cocos/base/ccTypes.cpp", "cocos/base/ccTypes.h", + "cocos/base/ccUTF8.cpp", + "cocos/base/ccUTF8.h", + "cocos/base/ccUtils.cpp", + "cocos/base/ccUtils.h", "cocos/base/etc1.cpp", "cocos/base/etc1.h", + "cocos/base/firePngData.h", "cocos/base/s3tc.cpp", "cocos/base/s3tc.h", + "cocos/base/uthash.h", + "cocos/base/utlist.h", + "cocos/cocos2d-prefix.pch", "cocos/cocos2d.cpp", "cocos/cocos2d.h", "cocos/deprecated/CCArray.cpp", @@ -787,28 +608,30 @@ "cocos/math/CCGeometry.h", "cocos/math/CCMath.h", "cocos/math/CCMathBase.h", + "cocos/math/CCVertex.cpp", + "cocos/math/CCVertex.h", "cocos/math/CMakeLists.txt", + "cocos/math/Mat4.cpp", + "cocos/math/Mat4.h", + "cocos/math/Mat4.inl", "cocos/math/MathUtil.cpp", "cocos/math/MathUtil.h", "cocos/math/MathUtil.inl", "cocos/math/MathUtilNeon.inl", - "cocos/math/Matrix.cpp", - "cocos/math/Matrix.h", - "cocos/math/Matrix.inl", "cocos/math/Quaternion.cpp", "cocos/math/Quaternion.h", "cocos/math/Quaternion.inl", "cocos/math/TransformUtils.cpp", "cocos/math/TransformUtils.h", - "cocos/math/Vector2.cpp", - "cocos/math/Vector2.h", - "cocos/math/Vector2.inl", - "cocos/math/Vector3.cpp", - "cocos/math/Vector3.h", - "cocos/math/Vector3.inl", - "cocos/math/Vector4.cpp", - "cocos/math/Vector4.h", - "cocos/math/Vector4.inl", + "cocos/math/Vec2.cpp", + "cocos/math/Vec2.h", + "cocos/math/Vec2.inl", + "cocos/math/Vec3.cpp", + "cocos/math/Vec3.h", + "cocos/math/Vec3.inl", + "cocos/math/Vec4.cpp", + "cocos/math/Vec4.h", + "cocos/math/Vec4.inl", "cocos/network/Android.mk", "cocos/network/CMakeLists.txt", "cocos/network/HttpClient.cpp", @@ -846,6 +669,186 @@ "cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h", "cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp", "cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h", + "cocos/platform/CCApplicationProtocol.h", + "cocos/platform/CCCommon.h", + "cocos/platform/CCDevice.h", + "cocos/platform/CCFileUtils.cpp", + "cocos/platform/CCFileUtils.h", + "cocos/platform/CCGLViewProtocol.cpp", + "cocos/platform/CCGLViewProtocol.h", + "cocos/platform/CCImage.cpp", + "cocos/platform/CCImage.h", + "cocos/platform/CCSAXParser.cpp", + "cocos/platform/CCSAXParser.h", + "cocos/platform/CCThread.cpp", + "cocos/platform/CCThread.h", + "cocos/platform/CMakeLists.txt", + "cocos/platform/android/Android.mk", + "cocos/platform/android/CCApplication.cpp", + "cocos/platform/android/CCApplication.h", + "cocos/platform/android/CCCommon.cpp", + "cocos/platform/android/CCDevice.cpp", + "cocos/platform/android/CCFileUtilsAndroid.cpp", + "cocos/platform/android/CCFileUtilsAndroid.h", + "cocos/platform/android/CCGL.h", + "cocos/platform/android/CCGLView.cpp", + "cocos/platform/android/CCGLView.h", + "cocos/platform/android/CCPlatformDefine.h", + "cocos/platform/android/CCStdC.h", + "cocos/platform/android/java/.classpath", + "cocos/platform/android/java/.project", + "cocos/platform/android/java/.settings/org.eclipse.jdt.core.prefs", + "cocos/platform/android/java/AndroidManifest.xml", + "cocos/platform/android/java/ant.properties", + "cocos/platform/android/java/build.xml", + "cocos/platform/android/java/proguard-project.txt", + "cocos/platform/android/java/project.properties", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java", + "cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java", + "cocos/platform/android/javaactivity.cpp", + "cocos/platform/android/jni/DPIJni.cpp", + "cocos/platform/android/jni/DPIJni.h", + "cocos/platform/android/jni/IMEJni.cpp", + "cocos/platform/android/jni/IMEJni.h", + "cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp", + "cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp", + "cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h", + "cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp", + "cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h", + "cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp", + "cocos/platform/android/jni/JniHelper.cpp", + "cocos/platform/android/jni/JniHelper.h", + "cocos/platform/android/jni/TouchesJni.cpp", + "cocos/platform/apple/CCFileUtilsApple.h", + "cocos/platform/apple/CCFileUtilsApple.mm", + "cocos/platform/apple/CCLock.cpp", + "cocos/platform/apple/CCLock.h", + "cocos/platform/apple/CCThread.mm", + "cocos/platform/desktop/CCGLView.cpp", + "cocos/platform/desktop/CCGLView.h", + "cocos/platform/ios/CCApplication.h", + "cocos/platform/ios/CCApplication.mm", + "cocos/platform/ios/CCCommon.mm", + "cocos/platform/ios/CCDevice.mm", + "cocos/platform/ios/CCDirectorCaller.h", + "cocos/platform/ios/CCDirectorCaller.mm", + "cocos/platform/ios/CCEAGLView.h", + "cocos/platform/ios/CCEAGLView.mm", + "cocos/platform/ios/CCES2Renderer.h", + "cocos/platform/ios/CCES2Renderer.m", + "cocos/platform/ios/CCESRenderer.h", + "cocos/platform/ios/CCGL.h", + "cocos/platform/ios/CCGLView.h", + "cocos/platform/ios/CCGLView.mm", + "cocos/platform/ios/CCImage.mm", + "cocos/platform/ios/CCPlatformDefine.h", + "cocos/platform/ios/CCStdC.h", + "cocos/platform/ios/OpenGL_Internal.h", + "cocos/platform/linux/CCApplication.cpp", + "cocos/platform/linux/CCApplication.h", + "cocos/platform/linux/CCCommon.cpp", + "cocos/platform/linux/CCDevice.cpp", + "cocos/platform/linux/CCFileUtilsLinux.cpp", + "cocos/platform/linux/CCFileUtilsLinux.h", + "cocos/platform/linux/CCGL.h", + "cocos/platform/linux/CCPlatformDefine.h", + "cocos/platform/linux/CCStdC.cpp", + "cocos/platform/linux/CCStdC.h", + "cocos/platform/mac/CCApplication.h", + "cocos/platform/mac/CCApplication.mm", + "cocos/platform/mac/CCCommon.mm", + "cocos/platform/mac/CCDevice.mm", + "cocos/platform/mac/CCGL.h", + "cocos/platform/mac/CCPlatformDefine.h", + "cocos/platform/mac/CCStdC.h", + "cocos/platform/win32/CCApplication.cpp", + "cocos/platform/win32/CCApplication.h", + "cocos/platform/win32/CCCommon.cpp", + "cocos/platform/win32/CCDevice.cpp", + "cocos/platform/win32/CCFileUtilsWin32.cpp", + "cocos/platform/win32/CCFileUtilsWin32.h", + "cocos/platform/win32/CCGL.h", + "cocos/platform/win32/CCPlatformDefine.h", + "cocos/platform/win32/CCStdC.cpp", + "cocos/platform/win32/CCStdC.h", + "cocos/platform/win32/compat/stdint.h", + "cocos/platform/winrt/CCApplication.cpp", + "cocos/platform/winrt/CCApplication.h", + "cocos/platform/winrt/CCCommon.cpp", + "cocos/platform/winrt/CCDevice.cpp", + "cocos/platform/winrt/CCFileUtilsWinRT.cpp", + "cocos/platform/winrt/CCFileUtilsWinRT.h", + "cocos/platform/winrt/CCFreeTypeFont.cpp", + "cocos/platform/winrt/CCFreeTypeFont.h", + "cocos/platform/winrt/CCGL.h", + "cocos/platform/winrt/CCGLView.cpp", + "cocos/platform/winrt/CCGLView.h", + "cocos/platform/winrt/CCGL_Angle.h", + "cocos/platform/winrt/CCPThreadWinRT.cpp", + "cocos/platform/winrt/CCPThreadWinRT.h", + "cocos/platform/winrt/CCPlatformDefine.h", + "cocos/platform/winrt/CCPrecompiledShaders.cpp", + "cocos/platform/winrt/CCPrecompiledShaders.h", + "cocos/platform/winrt/CCStdC.cpp", + "cocos/platform/winrt/CCStdC.h", + "cocos/platform/winrt/CCWinRTUtils.cpp", + "cocos/platform/winrt/CCWinRTUtils.h", + "cocos/platform/winrt/DirectXBase.cpp", + "cocos/platform/winrt/DirectXBase.h", + "cocos/platform/winrt/DirectXHelper.h", + "cocos/platform/winrt/InputEvent.cpp", + "cocos/platform/winrt/InputEvent.h", + "cocos/platform/winrt/InputEventTypes.h", + "cocos/platform/winrt/inet_ntop_winrt.cpp", + "cocos/platform/winrt/inet_ntop_winrt.h", + "cocos/platform/winrt/pch.cpp", + "cocos/platform/winrt/pch.h", + "cocos/platform/winrt/sha1.cpp", + "cocos/platform/winrt/sha1.h", + "cocos/platform/winrt/shaders/precompiledshaders.h", + "cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj", + "cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters", + "cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user", + "cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp", + "cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.h", + "cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp", + "cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.h", + "cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp", + "cocos/platform/wp8-xaml/cpp/Direct3DInterop.h", + "cocos/platform/wp8-xaml/cpp/DirectXBase.cpp", + "cocos/platform/wp8-xaml/cpp/DirectXBase.h", + "cocos/platform/wp8-xaml/cpp/DirectXHelper.h", + "cocos/platform/wp8-xaml/cpp/EditBoxEvent.cpp", + "cocos/platform/wp8-xaml/cpp/EditBoxEvent.h", + "cocos/platform/wp8-xaml/xaml/App.xaml", + "cocos/platform/wp8-xaml/xaml/App.xaml.cs", + "cocos/platform/wp8-xaml/xaml/EditBox.xaml", + "cocos/platform/wp8-xaml/xaml/EditBox.xaml.cs", + "cocos/platform/wp8-xaml/xaml/MainPage.xaml", + "cocos/platform/wp8-xaml/xaml/MainPage.xaml.cs", + "cocos/platform/wp8/CCGLView.cpp", + "cocos/platform/wp8/CCGLView.h", + "cocos/platform/wp8/Direct3DBase.cpp", + "cocos/platform/wp8/Direct3DBase.h", + "cocos/platform/wp8/DirectXBase.cpp", + "cocos/platform/wp8/DirectXBase.h", + "cocos/platform/wp8/shaders/precompiledshaders.h", "cocos/renderer/CCBatchCommand.cpp", "cocos/renderer/CCBatchCommand.h", "cocos/renderer/CCCustomCommand.cpp", @@ -860,6 +863,8 @@ "cocos/renderer/CCGLProgramStateCache.h", "cocos/renderer/CCGroupCommand.cpp", "cocos/renderer/CCGroupCommand.h", + "cocos/renderer/CCMeshCommand.cpp", + "cocos/renderer/CCMeshCommand.h", "cocos/renderer/CCQuadCommand.cpp", "cocos/renderer/CCQuadCommand.h", "cocos/renderer/CCRenderCommand.cpp", @@ -867,9 +872,18 @@ "cocos/renderer/CCRenderCommandPool.h", "cocos/renderer/CCRenderer.cpp", "cocos/renderer/CCRenderer.h", + "cocos/renderer/CCTexture2D.cpp", + "cocos/renderer/CCTexture2D.h", + "cocos/renderer/CCTextureAtlas.cpp", + "cocos/renderer/CCTextureAtlas.h", + "cocos/renderer/CCTextureCache.cpp", + "cocos/renderer/CCTextureCache.h", "cocos/renderer/CMakeLists.txt", "cocos/renderer/ccGLStateCache.cpp", "cocos/renderer/ccGLStateCache.h", + "cocos/renderer/ccShader_3D_Color.frag", + "cocos/renderer/ccShader_3D_ColorTex.frag", + "cocos/renderer/ccShader_3D_PositionTex.vert", "cocos/renderer/ccShader_Label.vert", "cocos/renderer/ccShader_Label_df.frag", "cocos/renderer/ccShader_Label_df_glow.frag", @@ -2205,6 +2219,7 @@ "licenses/LICENSE_zlib.txt", "plugin/AUTHORS", "plugin/README.md", + "plugin/jsbindings/Android.mk", "plugin/jsbindings/auto/api/jsb_cocos2dx_pluginx_auto_api.js", "plugin/jsbindings/auto/jsb_cocos2dx_pluginx_auto.cpp", "plugin/jsbindings/auto/jsb_cocos2dx_pluginx_auto.hpp", @@ -3747,6 +3762,7 @@ "cocos/scripting/lua-bindings/auto/api/SplitCols.lua", "cocos/scripting/lua-bindings/auto/api/SplitRows.lua", "cocos/scripting/lua-bindings/auto/api/Sprite.lua", + "cocos/scripting/lua-bindings/auto/api/Sprite3D.lua", "cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua", "cocos/scripting/lua-bindings/auto/api/SpriteDisplayData.lua", "cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua", diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index 9246c8519e..5a4dae3841 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -52,9 +52,9 @@ include_directories( ${COCOS2D_ROOT} ${COCOS2D_ROOT}/cocos ${COCOS2D_ROOT}/cocos/audio/include - ${COCOS2D_ROOT}/cocos/2d/platform - ${COCOS2D_ROOT}/cocos/2d/platform/desktop - ${COCOS2D_ROOT}/cocos/2d/platform/linux + ${COCOS2D_ROOT}/cocos/platform + ${COCOS2D_ROOT}/cocos/platform/desktop + ${COCOS2D_ROOT}/cocos/platform/linux ${COCOS2D_ROOT}/cocos/editor-support ${COCOS2D_ROOT}/extensions ${COCOS2D_ROOT}/external diff --git a/templates/cpp-template-default/Classes/HelloWorldScene.cpp b/templates/cpp-template-default/Classes/HelloWorldScene.cpp index 4ce3b8217d..cea2c2ccfa 100644 --- a/templates/cpp-template-default/Classes/HelloWorldScene.cpp +++ b/templates/cpp-template-default/Classes/HelloWorldScene.cpp @@ -28,7 +28,7 @@ bool HelloWorld::init() } Size visibleSize = Director::getInstance()->getVisibleSize(); - Vector2 origin = Director::getInstance()->getVisibleOrigin(); + Vec2 origin = Director::getInstance()->getVisibleOrigin(); ///////////////////////////// // 2. add a menu item with "X" image, which is clicked to quit the program @@ -40,12 +40,12 @@ bool HelloWorld::init() "CloseSelected.png", CC_CALLBACK_1(HelloWorld::menuCloseCallback, this)); - closeItem->setPosition(Vector2(origin.x + visibleSize.width - closeItem->getContentSize().width/2 , + closeItem->setPosition(Vec2(origin.x + visibleSize.width - closeItem->getContentSize().width/2 , origin.y + closeItem->getContentSize().height/2)); // create menu, it's an autorelease object auto menu = Menu::create(closeItem, NULL); - menu->setPosition(Vector2::ZERO); + menu->setPosition(Vec2::ZERO); this->addChild(menu, 1); ///////////////////////////// @@ -57,7 +57,7 @@ bool HelloWorld::init() auto label = LabelTTF::create("Hello World", "Arial", 24); // position the label on the center of the screen - label->setPosition(Vector2(origin.x + visibleSize.width/2, + label->setPosition(Vec2(origin.x + visibleSize.width/2, origin.y + visibleSize.height - label->getContentSize().height)); // add the label as a child to this layer @@ -67,7 +67,7 @@ bool HelloWorld::init() auto sprite = Sprite::create("HelloWorld.png"); // position the sprite on the center of the screen - sprite->setPosition(Vector2(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y)); + sprite->setPosition(Vec2(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y)); // add the sprite as a child to this layer this->addChild(sprite, 0); diff --git a/templates/cpp-template-default/proj.android/AndroidManifest.xml b/templates/cpp-template-default/proj.android/AndroidManifest.xml index 03b6257326..4f76d5ccfc 100644 --- a/templates/cpp-template-default/proj.android/AndroidManifest.xml +++ b/templates/cpp-template-default/proj.android/AndroidManifest.xml @@ -9,7 +9,10 @@ - + + + - - - diff --git a/templates/cpp-template-default/proj.android/build_native.py b/templates/cpp-template-default/proj.android/build_native.py index d8d303498e..15fc6912c3 100755 --- a/templates/cpp-template-default/proj.android/build_native.py +++ b/templates/cpp-template-default/proj.android/build_native.py @@ -89,7 +89,7 @@ def do_build(cocos_root, ndk_root, app_android_root,ndk_build_param,sdk_root,and raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!") elif android_platform is not None: sdk_tool_path = os.path.join(sdk_root, "tools/android") - cocoslib_path = os.path.join(cocos_root, "cocos/2d/platform/android/java") + cocoslib_path = os.path.join(cocos_root, "cocos/platform/android/java") command = '%s update lib-project -t %s -p %s' % (sdk_tool_path,android_platform,cocoslib_path) if os.system(command) != 0: raise Exception("update cocos lib-project [ " + cocoslib_path + " ] fails!") diff --git a/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp b/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp index 26fe88c3a5..5199d12ab4 100644 --- a/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp +++ b/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp @@ -1,6 +1,6 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include diff --git a/templates/cpp-template-default/proj.android/project.properties b/templates/cpp-template-default/proj.android/project.properties index 870a4a196d..dc57659a70 100644 --- a/templates/cpp-template-default/proj.android/project.properties +++ b/templates/cpp-template-default/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../cocos2d/cocos/2d/platform/android/java +android.library.reference.1=../cocos2d/cocos/platform/android/java diff --git a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index db8316cc38..20dc740a62 100644 --- a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -820,8 +820,8 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/2d/platform/ios", - "$(SRCROOT)/../cocos2d/cocos/2d/platform/ios/Simulation", + "$(SRCROOT)/../cocos2d/cocos/platform/ios", + "$(SRCROOT)/../cocos2d/cocos/platform/ios/Simulation", ); INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; @@ -849,8 +849,8 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/2d/platform/ios", - "$(SRCROOT)/../cocos2d/cocos/2d/platform/ios/Simulation", + "$(SRCROOT)/../cocos2d/cocos/platform/ios", + "$(SRCROOT)/../cocos2d/cocos/platform/ios/Simulation", ); INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; @@ -881,7 +881,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/2d/platform/mac", + "$(SRCROOT)/../cocos2d/cocos/platform/mac", "$(SRCROOT)/../cocos2d/external/glfw3/include/mac", ); INFOPLIST_FILE = mac/Info.plist; @@ -908,7 +908,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/../cocos2d/cocos/2d/platform/mac", + "$(SRCROOT)/../cocos2d/cocos/platform/mac", "$(SRCROOT)/../cocos2d/external/glfw3/include/mac", ); INFOPLIST_FILE = mac/Info.plist; diff --git a/templates/lua-template-default/frameworks/CMakeLists.txt b/templates/lua-template-default/frameworks/CMakeLists.txt index 1fa676bb57..cb1df16d4c 100644 --- a/templates/lua-template-default/frameworks/CMakeLists.txt +++ b/templates/lua-template-default/frameworks/CMakeLists.txt @@ -58,9 +58,9 @@ include_directories( ${COCOS2D_ROOT} ${COCOS2D_ROOT}/cocos ${COCOS2D_ROOT}/cocos/audio/include - ${COCOS2D_ROOT}/cocos/2d/platform - ${COCOS2D_ROOT}/cocos/2d/platform/desktop - ${COCOS2D_ROOT}/cocos/2d/platform/linux + ${COCOS2D_ROOT}/cocos/platform + ${COCOS2D_ROOT}/cocos/platform/desktop + ${COCOS2D_ROOT}/cocos/platform/linux ${COCOS2D_ROOT}/cocos/editor-support ${COCOS2D_ROOT}/extensions ${COCOS2D_ROOT}/external diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/AndroidManifest.xml b/templates/lua-template-default/frameworks/runtime-src/proj.android/AndroidManifest.xml index d83b700b63..07d5ec8d82 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/AndroidManifest.xml +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/AndroidManifest.xml @@ -9,17 +9,16 @@ - + + + + - - - - diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp index 26fe88c3a5..5199d12ab4 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp @@ -1,6 +1,6 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties b/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties index 44eace38a5..8e5895514b 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../cocos2d-x/cocos/2d/platform/android/java +android.library.reference.1=../../cocos2d-x/cocos/platform/android/java diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index e894d09394..ea9894228d 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -926,7 +926,7 @@ 10000, ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; }; name = Debug; }; @@ -952,7 +952,7 @@ 10000, ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; }; name = Release; }; @@ -1023,7 +1023,7 @@ LIBRARY_SEARCH_PATHS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios"; }; name = Debug; }; @@ -1045,7 +1045,7 @@ LIBRARY_SEARCH_PATHS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios"; }; name = Release; }; diff --git a/templates/lua-template-runtime/.buildpath b/templates/lua-template-runtime/.buildpath deleted file mode 100644 index 53ba323fe6..0000000000 --- a/templates/lua-template-runtime/.buildpath +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/templates/lua-template-runtime/.project b/templates/lua-template-runtime/.project index 12fd28f45b..e01d2304ee 100644 --- a/templates/lua-template-runtime/.project +++ b/templates/lua-template-runtime/.project @@ -1,6 +1,6 @@ - CocosGame + HelloLua @@ -10,4 +10,7 @@ org.ccdt.cocosproject org.eclipse.koneki.ldt.nature + + 1.1 + diff --git a/templates/lua-template-runtime/cocos-project-template.json b/templates/lua-template-runtime/cocos-project-template.json index d69785172f..fe0b0c07c0 100644 --- a/templates/lua-template-runtime/cocos-project-template.json +++ b/templates/lua-template-runtime/cocos-project-template.json @@ -5,6 +5,12 @@ "runtime/config.json", "runtime/version.json" ], + "project_replace_project_name": { + "src_project_name": "HelloLua", + "files": [ + "config.json", + ".project"] + }, "append_dir": [ { "from": "cocos/scripting/lua-bindings/script", @@ -125,6 +131,8 @@ "project_replace_project_name": { "src_project_name": "HelloLua", "files": [ + "config.json", + ".project", "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj", "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.filters", "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.user", @@ -139,7 +147,8 @@ "frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch", "frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm", "frameworks/runtime-src/proj.ios_mac/PROJECT_NAME.xcodeproj/project.pbxproj", - "frameworks/runtime-src/Classes/AppDelegate.cpp" + "frameworks/runtime-src/Classes/AppDelegate.cpp", + "frameworks/runtime-src/Classes/ConfigParser.cpp" ] }, "project_replace_package_name": { diff --git a/templates/lua-template-runtime/config.json b/templates/lua-template-runtime/config.json new file mode 100644 index 0000000000..09215954df --- /dev/null +++ b/templates/lua-template-runtime/config.json @@ -0,0 +1,56 @@ +{ + "init_cfg":{ + "isLandscape": true, + "name": "HelloLua", + "width": 960, + "height": 640, + "entry": "src/main.lua" + }, + "simulator_screen_size": [ + { + "title": "iPhone 3Gs (480x320)", + "width": 480, + "height": 320 + }, + { + "title": "iPhone 4 (960x640)", + "width": 960, + "height": 640 + }, + { + "title": "iPhone 5 (1136x640)", + "width": 1136, + "height": 640 + }, + { + "title": "iPad (1024x768)", + "width": 1024, + "height": 768 + }, + { + "title": "iPad Retina (2048x1536)", + "width": 2048, + "height": 1536 + }, + { + "title": "Android (800x480)", + "width": 800, + "height": 480 + }, + { + "title": "Android (854x480)", + "width": 854, + "height": 480 + }, + { + "title": "Android (1280x720)", + "width": 1280, + "height": 720 + }, + { + "title": "Android (1920x1080)", + "width": 1920, + "height": 1080 + } + ] +} diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp index 296ea8da79..6cac00e17c 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -3,6 +3,7 @@ #include "SimpleAudioEngine.h" #include "cocos2d.h" #include "Runtime.h" +#include "ConfigParser.h" using namespace CocosDenshion; @@ -20,32 +21,50 @@ AppDelegate::~AppDelegate() bool AppDelegate::applicationDidFinishLaunching() { + +#if (COCOS2D_DEBUG>0) + initRuntime(); +#endif + + if (!ConfigParser::getInstance()->isInit()) { + ConfigParser::getInstance()->readConfig(); + } + // initialize director auto director = Director::getInstance(); - auto glview = director->getOpenGLView(); + auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::createWithRect("HelloLua", Rect(0,0,900,640)); + Size viewSize = ConfigParser::getInstance()->getInitViewSize(); + string title = ConfigParser::getInstance()->getInitViewName(); +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + extern void createSimulator(const char* viewName, float width, float height,bool isLandscape = true, float frameZoomFactor = 1.0f); + bool isLanscape = ConfigParser::getInstance()->isLanscape(); + createSimulator(title.c_str(),viewSize.width,viewSize.height,isLanscape); +#else + glview = GLView::createWithRect(title.c_str(), Rect(0,0,viewSize.width,viewSize.height)); director->setOpenGLView(glview); +#endif } - glview->setDesignResolutionSize(480, 320, ResolutionPolicy::NO_BORDER); - // turn on display FPS director->setDisplayStats(true); // set FPS. the default value is 1.0/60 if you don't call this director->setAnimationInterval(1.0 / 60); -#ifdef COCOS2D_DEBUG + auto engine = LuaEngine::getInstance(); + ScriptEngineManager::getInstance()->setScriptEngine(engine); + + //register custom function + //LuaStack* stack = engine->getLuaStack(); + //register_custom_function(stack->getLuaState()); + +#if (COCOS2D_DEBUG>0) if (startRuntime()) return true; #endif - auto engine = LuaEngine::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(engine); - if (engine->executeScriptFile("src/main.lua")) { - return false; - } + engine->executeScriptFile(ConfigParser::getInstance()->getEntryFile().c_str()); return true; } @@ -64,3 +83,4 @@ void AppDelegate::applicationWillEnterForeground() SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); } + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h index 5cf478d052..b196f0319b 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h @@ -1,8 +1,7 @@ #ifndef __APP_DELEGATE_H__ #define __APP_DELEGATE_H__ -#include "cocos2d.h" - +#include "CCApplication.h" /** @brief The cocos2d Application. diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.cpp new file mode 100644 index 0000000000..3cc5bb8618 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.cpp @@ -0,0 +1,127 @@ + +#include "json/document.h" +#include "json/filestream.h" +#include "json/stringbuffer.h" +#include "json/writer.h" +#include "ConfigParser.h" + +// ConfigParser +ConfigParser *ConfigParser::s_sharedInstance = NULL; +ConfigParser *ConfigParser::getInstance(void) +{ + if (!s_sharedInstance) + { + s_sharedInstance = new ConfigParser(); + } + return s_sharedInstance; +} + +bool ConfigParser::isInit() +{ + return _isInit; +} + +void ConfigParser::readConfig() +{ + _isInit = true; + string filecfg = "config.json"; + + string fileContent; +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID && !defined(NDEBUG)) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS && defined(COCOS2D_DEBUG)) + string fullPathFile = FileUtils::getInstance()->getWritablePath(); + fullPathFile.append("debugruntime/"); + fullPathFile.append(filecfg.c_str()); + fileContent=FileUtils::getInstance()->getStringFromFile(fullPathFile.c_str()); +#endif + + if (fileContent.empty()) { + filecfg=FileUtils::getInstance()->fullPathForFilename(filecfg.c_str()); + fileContent=FileUtils::getInstance()->getStringFromFile(filecfg.c_str()); + } + + if(!fileContent.empty()) + { + _docRootjson.Parse<0>(fileContent.c_str()); + if (_docRootjson.HasMember("init_cfg")) + { + if(_docRootjson["init_cfg"].IsObject()) + { + const rapidjson::Value& objectInitView = _docRootjson["init_cfg"]; + if (objectInitView.HasMember("width") && objectInitView.HasMember("height")) + { + _initViewSize.width = objectInitView["width"].GetUint(); + _initViewSize.height = objectInitView["height"].GetUint(); + } + if (objectInitView.HasMember("name") && objectInitView["name"].IsString()) + { + _viewName = objectInitView["name"].GetString(); + } + if (objectInitView.HasMember("isLandscape") && objectInitView["isLandscape"].IsBool()) { + _isLandscape = objectInitView["isLandscape"].GetBool(); + } + if (objectInitView.HasMember("entry") && objectInitView["entry"].IsString()) { + _entryfile = objectInitView["entry"].GetString(); + } + } + } + if (_docRootjson.HasMember("simulator_screen_size")) + { + const rapidjson::Value& ArrayScreenSize = _docRootjson["simulator_screen_size"]; + if (ArrayScreenSize.IsArray()) + { + for (int i=0; i +#include +#include "cocos2d.h" +#include "json/document.h" +using namespace std; +USING_NS_CC; + +// ConfigParser +typedef struct _SimulatorScreenSize { + string title; + int width; + int height; + + _SimulatorScreenSize(const string title_, int width_, int height_) + { + title = title_; + width = width_; + height = height_; + } +} SimulatorScreenSize; + +typedef vector ScreenSizeArray; +class ConfigParser +{ +public: + static ConfigParser *getInstance(void); + void readConfig(); + + // predefined screen size + int getScreenSizeCount(void); + cocos2d::Size getInitViewSize(); + string getInitViewName(); + string getEntryFile(); + rapidjson::Document& getConfigJsonRoot(); + const SimulatorScreenSize getScreenSize(int index); + bool isLanscape(); + bool isInit(); + +private: + ConfigParser(void); + static ConfigParser *s_sharedInstance; + ScreenSizeArray _screenSizeArray; + cocos2d::Size _initViewSize; + string _viewName; + string _entryfile; + bool _isLandscape; + bool _isInit; + + rapidjson::Document _docRootjson; +}; + +#endif // __CONFIG_PARSER_H__ + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp index 985e99e7d9..e412f80d62 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp @@ -30,6 +30,9 @@ THE SOFTWARE. #include "json/filestream.h" #include "json/stringbuffer.h" #include "json/writer.h" +#include "LuaBasicConversions.h" +#include "VisibleRect.h" +#include "ConfigParser.h" #ifdef _WIN32 #include @@ -45,12 +48,12 @@ using namespace cocos2d; std::string g_resourcePath; static rapidjson::Document g_filecfgjson; - extern string getIPAddress(); const char* getRuntimeVersion() { - return "0.0.1"; + return "1.1"; } + void startScript(string strDebugArg) { // register lua engine @@ -60,7 +63,7 @@ void startScript(string strDebugArg) engine->executeString(strDebugArg.c_str()); } cocos2d::log("debug args = %s",strDebugArg.c_str()); - engine->executeScriptFile("src/main.lua"); + engine->executeScriptFile(ConfigParser::getInstance()->getEntryFile().c_str()); } bool reloadScript(const string& modulefile) @@ -68,7 +71,7 @@ bool reloadScript(const string& modulefile) string strfile = modulefile; if (strfile.empty()) { - strfile = "src/main.lua"; + strfile = ConfigParser::getInstance()->getEntryFile().c_str(); } auto director = Director::getInstance(); @@ -86,95 +89,6 @@ bool reloadScript(const string& modulefile) return (LuaEngine::getInstance()->reload(strfile.c_str())==0); } - -class VisibleRect -{ -public: - static Rect getVisibleRect(); - - static Vector2 left(); - static Vector2 right(); - static Vector2 top(); - static Vector2 bottom(); - static Vector2 center(); - static Vector2 leftTop(); - static Vector2 rightTop(); - static Vector2 leftBottom(); - static Vector2 rightBottom(); -private: - static void lazyInit(); - static Rect s_visibleRect; -}; - -Rect VisibleRect::s_visibleRect; - -void VisibleRect::lazyInit() -{ - // no lazy init - // Useful if we change the resolution in runtime - s_visibleRect = Director::getInstance()->getOpenGLView()->getVisibleRect(); -} - -Rect VisibleRect::getVisibleRect() -{ - lazyInit(); - return s_visibleRect; -} - -Vector2 VisibleRect::left() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x, s_visibleRect.origin.y+s_visibleRect.size.height/2); -} - -Vector2 VisibleRect::right() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y+s_visibleRect.size.height/2); -} - -Vector2 VisibleRect::top() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y+s_visibleRect.size.height); -} - -Vector2 VisibleRect::bottom() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y); -} - -Vector2 VisibleRect::center() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y+s_visibleRect.size.height/2); -} - -Vector2 VisibleRect::leftTop() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x, s_visibleRect.origin.y+s_visibleRect.size.height); -} - -Vector2 VisibleRect::rightTop() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y+s_visibleRect.size.height); -} - -Vector2 VisibleRect::leftBottom() -{ - lazyInit(); - return s_visibleRect.origin; -} - -Vector2 VisibleRect::rightBottom() -{ - lazyInit(); - return Vector2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y); -} - class ConnectWaitLayer: public Layer { public: @@ -186,7 +100,7 @@ public: sprintf(szIPAddress, "LocalIP: %s",strip.c_str()); auto label = LabelTTF::create(szIPAddress, "Arial", 24); addChild(label, 9999); - label->setPosition( Vector2(VisibleRect::center().x, VisibleRect::top().y - 30) ); + label->setPosition( Point(VisibleRect::center().x, VisibleRect::top().y - 30) ); string strShowMsg =""; if (CC_PLATFORM_WIN32 == CC_TARGET_PLATFORM || CC_PLATFORM_MAC == CC_TARGET_PLATFORM) @@ -198,15 +112,15 @@ public: } auto labelwait = LabelTTF::create(strShowMsg.c_str(), "Arial", 22); addChild(labelwait, 10000); - labelwait->setPosition( Vector2(VisibleRect::center().x, VisibleRect::center().y) ); + labelwait->setPosition( Point(VisibleRect::center().x, VisibleRect::center().y) ); - auto labelPlay = LabelTTF::create("play", "Arial", 20); + auto labelPlay = LabelTTF::create("play", "Arial", 36); auto menuItem = MenuItemLabel::create(labelPlay, CC_CALLBACK_1(ConnectWaitLayer::playerCallback, this)); auto menu = Menu::create(menuItem, NULL); - menu->setPosition( Vector2::ZERO ); - menuItem->setPosition( Vector2( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) ); + menu->setPosition( Point::ZERO ); + menuItem->setPosition( Point( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) ); addChild(menu, 1); } @@ -669,6 +583,14 @@ public: dReplyParse.AddMember("body",bodyvalue,dReplyParse.GetAllocator()); dReplyParse.AddMember("code",0,dReplyParse.GetAllocator()); + }else if (strcmp(strcmd.c_str(),"getEntryfile")==0) + { + rapidjson::Value bodyvalue(rapidjson::kObjectType); + rapidjson::Value entryFileValue(rapidjson::kStringType); + entryFileValue.SetString(ConfigParser::getInstance()->getEntryFile().c_str(),dReplyParse.GetAllocator()); + bodyvalue.AddMember("entryfile",entryFileValue,dReplyParse.GetAllocator()); + dReplyParse.AddMember("body",bodyvalue,dReplyParse.GetAllocator()); + dReplyParse.AddMember("code",0,dReplyParse.GetAllocator()); }else if(strcmp(strcmd.c_str(),"getIP")==0) { rapidjson::Value bodyvalue(rapidjson::kObjectType); @@ -748,19 +670,81 @@ private: FileServer* _fileserver; }; -bool startRuntime() +int lua_cocos2dx_runtime_addSearchPath(lua_State* tolua_S) { -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#ifndef _DEBUG - return false; + int argc = 0; + cocos2d::FileUtils* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; #endif -#elif(CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#ifdef NDEBUG - return false; + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror; #endif + + cobj = (cocos2d::FileUtils*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FileUtils_addSearchPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + if(!ok) + return 0; + + if (!FileUtils::getInstance()->isAbsolutePath(arg0)) + arg0 = g_resourcePath+arg0; + + cobj->addSearchPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSearchPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_addSearchPath'.",&tolua_err); +#endif + + return 0; +} + +static void register_runtime_override_function(lua_State* tolua_S) +{ + lua_pushstring(tolua_S, "cc.FileUtils"); + lua_rawget(tolua_S, LUA_REGISTRYINDEX); + if (lua_istable(tolua_S,-1)) + { + tolua_function(tolua_S,"addSearchPath",lua_cocos2dx_runtime_addSearchPath); + } + lua_pop(tolua_S, 1); +} + +bool initRuntime() +{ +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#ifndef _DEBUG + return false; +#endif +#elif(CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +#ifdef NDEBUG + return false; +#endif #elif(CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#ifndef COCOS2D_DEBUG - return false; +#ifndef COCOS2D_DEBUG + return false; #endif #endif @@ -779,18 +763,47 @@ bool startRuntime() resourcePath =replaceAll(resourcePath,"\\","/"); g_resourcePath = resourcePath; } - + #else g_resourcePath = FileUtils::getInstance()->getWritablePath(); - + g_resourcePath += "debugruntime/"; #endif - + g_resourcePath=replaceAll(g_resourcePath,"\\","/"); + if (g_resourcePath.at(g_resourcePath.length()-1) != '/') + { + g_resourcePath.append("/"); + } + searchPathArray.insert(searchPathArray.begin(),g_resourcePath); FileUtils::getInstance()->setSearchPaths(searchPathArray); + + return true; +} + +bool startRuntime() +{ +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#ifndef _DEBUG + return false; +#endif +#elif(CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +#ifdef NDEBUG + return false; +#endif +#elif(CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#ifndef COCOS2D_DEBUG + return false; +#endif +#endif + static ConsoleCustomCommand s_customCommand; auto engine = LuaEngine::getInstance(); ScriptEngineManager::getInstance()->setScriptEngine(engine); + + LuaStack* stack = engine->getLuaStack(); + register_runtime_override_function(stack->getLuaState()); + luaopen_debugger(engine->getLuaStack()->getLuaState()); readResFileFinfo(); @@ -803,40 +816,3 @@ bool startRuntime() return true; } - -// SimulatorConfig -SimulatorConfig *SimulatorConfig::s_sharedInstance = NULL; -SimulatorConfig *SimulatorConfig::getInstance(void) -{ - if (!s_sharedInstance) - { - s_sharedInstance = new SimulatorConfig(); - } - return s_sharedInstance; -} - -SimulatorConfig::SimulatorConfig(void) -{ - m_screenSizeArray.push_back(SimulatorScreenSize("iPhone 3Gs (480x320)", 480, 320)); - m_screenSizeArray.push_back(SimulatorScreenSize("iPhone 4 (960x640)", 960, 640)); - m_screenSizeArray.push_back(SimulatorScreenSize("iPhone 5 (1136x640)", 1136, 640)); - m_screenSizeArray.push_back(SimulatorScreenSize("iPad (1024x768)", 1024, 768)); - m_screenSizeArray.push_back(SimulatorScreenSize("iPad Retina (2048x1536)", 2048, 1536)); - m_screenSizeArray.push_back(SimulatorScreenSize("Android (800x480)", 800, 480)); - m_screenSizeArray.push_back(SimulatorScreenSize("Android (854x480)", 854, 480)); - m_screenSizeArray.push_back(SimulatorScreenSize("Android (960x540)", 960, 540)); - m_screenSizeArray.push_back(SimulatorScreenSize("Android (1024x600)", 1024, 600)); - m_screenSizeArray.push_back(SimulatorScreenSize("Android (1280x720)", 1280, 720)); - m_screenSizeArray.push_back(SimulatorScreenSize("Android (1280x800)", 1280, 800)); - m_screenSizeArray.push_back(SimulatorScreenSize("Android (1920x1080)", 1920, 1080)); -} - -int SimulatorConfig::getScreenSizeCount(void) -{ - return (int)m_screenSizeArray.size(); -} - -const SimulatorScreenSize SimulatorConfig::getScreenSize(int index) -{ - return m_screenSizeArray.at(index); -} \ No newline at end of file diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h index d6b6fd0b5f..284c34942f 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h @@ -26,43 +26,12 @@ THE SOFTWARE. #define _RUNTIME__H_ #include -#include using namespace std; - +bool initRuntime(); bool startRuntime(); bool reloadScript(const string& modulefile); -// SimulatorConfig -typedef struct _SimulatorScreenSize { - string title; - int width; - int height; - - _SimulatorScreenSize(const string title_, int width_, int height_) - { - title = title_; - width = width_; - height = height_; - } -} SimulatorScreenSize; - -typedef vector ScreenSizeArray; -class SimulatorConfig -{ -public: - static SimulatorConfig *getInstance(void); - - // predefined screen size - int getScreenSizeCount(void); - const SimulatorScreenSize getScreenSize(int index); - -private: - SimulatorConfig(void); - static SimulatorConfig *s_sharedInstance; - ScreenSizeArray m_screenSizeArray; -}; - #endif // _RUNTIME__H_ diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/VisibleRect.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/VisibleRect.cpp new file mode 100644 index 0000000000..639aac8ed7 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/VisibleRect.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** + 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 "VisibleRect.h" + +USING_NS_CC; + +Rect VisibleRect::s_visibleRect; + +void VisibleRect::lazyInit() +{ + // no lazy init + // Useful if we change the resolution in runtime + s_visibleRect = Director::getInstance()->getOpenGLView()->getVisibleRect(); +} + +Rect VisibleRect::getVisibleRect() +{ + lazyInit(); + return s_visibleRect; +} + +Vec2 VisibleRect::left() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x, s_visibleRect.origin.y+s_visibleRect.size.height/2); +} + +Vec2 VisibleRect::right() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y+s_visibleRect.size.height/2); +} + +Vec2 VisibleRect::top() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y+s_visibleRect.size.height); +} + +Vec2 VisibleRect::bottom() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y); +} + +Vec2 VisibleRect::center() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y+s_visibleRect.size.height/2); +} + +Vec2 VisibleRect::leftTop() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x, s_visibleRect.origin.y+s_visibleRect.size.height); +} + +Vec2 VisibleRect::rightTop() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y+s_visibleRect.size.height); +} + +Vec2 VisibleRect::leftBottom() +{ + lazyInit(); + return s_visibleRect.origin; +} + +Vec2 VisibleRect::rightBottom() +{ + lazyInit(); + return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y); +} diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/VisibleRect.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/VisibleRect.h new file mode 100644 index 0000000000..625f7c3f5f --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/VisibleRect.h @@ -0,0 +1,25 @@ +#ifndef __VISIBLERECT_H__ +#define __VISIBLERECT_H__ + +#include "cocos2d.h" + +class VisibleRect +{ +public: + static cocos2d::Rect getVisibleRect(); + + static cocos2d::Vec2 left(); + static cocos2d::Vec2 right(); + static cocos2d::Vec2 top(); + static cocos2d::Vec2 bottom(); + static cocos2d::Vec2 center(); + static cocos2d::Vec2 leftTop(); + static cocos2d::Vec2 rightTop(); + static cocos2d::Vec2 leftBottom(); + static cocos2d::Vec2 rightBottom(); +private: + static void lazyInit(); + static cocos2d::Rect s_visibleRect; +}; + +#endif /* __VISIBLERECT_H__ */ diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml index d83b700b63..07d5ec8d82 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml @@ -9,17 +9,16 @@ - + + + + - - - - diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json index 6c205b4d1a..ad111cc1f2 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json @@ -8,11 +8,17 @@ "copy_resources": [ { "from": "../../../src", - "to": "src" + "to": "src", + "exclude": [ + "*.gz" + ] }, { "from": "../../../res", - "to": "res" + "to": "res", + "exclude": [ + "*.gz" + ] } ], "must_copy_resources": [ @@ -20,6 +26,10 @@ "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", "to": "" }, + { + "from": "../../../config.json", + "to": "" + }, { "from": "../../cocos2d-x/external/lua/luasocket", "to": "", diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk index ab9918e988..9aa5bd9ad6 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk @@ -8,7 +8,9 @@ LOCAL_MODULE_FILENAME := libcocos2dlua LOCAL_SRC_FILES := lua/main.cpp \ lua/Runtime_android.cpp \ + ../../Classes/VisibleRect.cpp \ ../../Classes/AppDelegate.cpp \ + ../../Classes/ConfigParser.cpp \ ../../Classes/Runtime.cpp diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp index 26fe88c3a5..3aae632663 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp @@ -1,8 +1,9 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include +#include "ConfigParser.h" #define LOG_TAG "main" #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) @@ -13,3 +14,16 @@ void cocos_android_app_init (JNIEnv* env, jobject thiz) { LOGD("cocos_android_app_init"); AppDelegate *pAppDelegate = new AppDelegate(); } + +extern "C" +{ + bool Java_org_cocos2dx_lua_AppActivity_nativeIsLandScape(JNIEnv *env, jobject thisz) + { + if (!ConfigParser::getInstance()->isInit()) + { + ConfigParser::getInstance()->readConfig(); + } + return ConfigParser::getInstance()->isLanscape(); + } +} + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties index 44eace38a5..8e5895514b 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../cocos2d-x/cocos/2d/platform/android/java +android.library.reference.1=../../cocos2d-x/cocos/platform/android/java diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java index abed6d72d5..d03b838a65 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java @@ -38,6 +38,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; +import android.content.pm.ActivityInfo; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.wifi.WifiInfo; @@ -60,6 +61,12 @@ public class AppActivity extends Cocos2dxActivity{ // TODO Auto-generated method stub super.onCreate(savedInstanceState); + if(nativeIsLandScape()) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); + } else { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT); + } + //2.Set the format of window // Check the wifi is opened when the android:debuggable is "true". @@ -115,4 +122,6 @@ public class AppActivity extends Cocos2dxActivity{ return null; } + private static native boolean nativeIsLandScape(); + } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index f1740b1ea5..e0734cdb29 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -50,6 +50,8 @@ 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */; }; 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */; }; 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */; }; + C033B51C191B337200D06937 /* VisibleRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C033B51A191B337200D06937 /* VisibleRect.cpp */; }; + C033B51D191B337200D06937 /* VisibleRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C033B51A191B337200D06937 /* VisibleRect.cpp */; }; C03781B918BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781BB18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; @@ -92,8 +94,12 @@ C03781F218BF656A00FE4F13 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CE18BF656A00FE4F13 /* StudioConstants.lua */; }; C03781F518BF65A900FE4F13 /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B418BF654500FE4F13 /* libluabindings Mac.a */; }; C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B618BF654500FE4F13 /* libluabindings iOS.a */; }; + C05D1C121923449100B808A4 /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = C05D1C111923449100B808A4 /* config.json */; }; + C05D1C131923449100B808A4 /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = C05D1C111923449100B808A4 /* config.json */; }; C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; }; C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; }; + C06C3796191A1D1E00617BED /* ConfigParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06C3794191A1D1E00617BED /* ConfigParser.cpp */; }; + C06C3797191A1D1E00617BED /* ConfigParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06C3794191A1D1E00617BED /* ConfigParser.cpp */; }; C07828F818B4D72E00BD2287 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C07828F418B4D72E00BD2287 /* main.m */; }; C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C07828F518B4D72E00BD2287 /* MainMenu.xib */; }; C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = C07828F718B4D72E00BD2287 /* SimulatorApp.mm */; }; @@ -340,6 +346,8 @@ 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + C033B51A191B337200D06937 /* VisibleRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VisibleRect.cpp; path = ../Classes/VisibleRect.cpp; sourceTree = ""; }; + C033B51B191B337200D06937 /* VisibleRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VisibleRect.h; path = ../Classes/VisibleRect.h; sourceTree = ""; }; C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../cocos2d-x/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = ""; }; C03781B718BF655400FE4F13 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../../res; sourceTree = ""; }; C03781B818BF655400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = ""; }; @@ -361,7 +369,10 @@ C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = ""; }; C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = ""; }; C03781CE18BF656A00FE4F13 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/StudioConstants.lua"; sourceTree = ""; }; + C05D1C111923449100B808A4 /* config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = config.json; path = ../../../config.json; sourceTree = ""; }; C0619CD61896894800872C26 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = ""; }; + C06C3794191A1D1E00617BED /* ConfigParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConfigParser.cpp; path = ../Classes/ConfigParser.cpp; sourceTree = ""; }; + C06C3795191A1D1E00617BED /* ConfigParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConfigParser.h; path = ../Classes/ConfigParser.h; sourceTree = ""; }; C07828F418B4D72E00BD2287 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; C07828F518B4D72E00BD2287 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; C07828F618B4D72E00BD2287 /* SimulatorApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatorApp.h; sourceTree = ""; }; @@ -615,6 +626,10 @@ F293BB7C15EB830F00256477 /* Classes */ = { isa = PBXGroup; children = ( + C033B51A191B337200D06937 /* VisibleRect.cpp */, + C033B51B191B337200D06937 /* VisibleRect.h */, + C06C3794191A1D1E00617BED /* ConfigParser.cpp */, + C06C3795191A1D1E00617BED /* ConfigParser.h */, C07828FB18B4DC6F00BD2287 /* Runtime.cpp */, C07828FC18B4DC6F00BD2287 /* Runtime.h */, C0619CD61896894800872C26 /* Runtime_ios-mac.mm */, @@ -627,6 +642,7 @@ F293BC4615EB859D00256477 /* Resources */ = { isa = PBXGroup; children = ( + C05D1C111923449100B808A4 /* config.json */, C03781B718BF655400FE4F13 /* res */, C03781B818BF655400FE4F13 /* src */, ); @@ -849,6 +865,7 @@ C03781DE18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, C03781E818BF656A00FE4F13 /* json.lua in Resources */, C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + C05D1C131923449100B808A4 /* config.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -899,6 +916,7 @@ C08D5D6618E567C6009071A4 /* tp.lua in Resources */, 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */, C08D5D6818E567C6009071A4 /* url.lua in Resources */, + C05D1C121923449100B808A4 /* config.json in Resources */, C03781DD18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, C03781E318BF656A00FE4F13 /* extern.lua in Resources */, C03781D918BF656A00FE4F13 /* Deprecated.lua in Resources */, @@ -914,8 +932,10 @@ files = ( C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */, 5023813317EBBCE400990C9B /* AppDelegate.cpp in Sources */, + C033B51D191B337200D06937 /* VisibleRect.cpp in Sources */, C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */, C07828FE18B4DC7000BD2287 /* Runtime.cpp in Sources */, + C06C3797191A1D1E00617BED /* ConfigParser.cpp in Sources */, C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */, C07828F818B4D72E00BD2287 /* main.m in Sources */, C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */, @@ -928,7 +948,9 @@ files = ( 5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */, F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */, + C06C3796191A1D1E00617BED /* ConfigParser.cpp in Sources */, 5023812417EBBCAC00990C9B /* main.m in Sources */, + C033B51C191B337200D06937 /* VisibleRect.cpp in Sources */, C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */, C07828FD18B4DC6F00BD2287 /* Runtime.cpp in Sources */, 5023811817EBBCAC00990C9B /* AppController.mm in Sources */, @@ -1019,6 +1041,7 @@ HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = mac/Info.plist; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_LDFLAGS = ( "-image_base", 100000000, @@ -1026,7 +1049,7 @@ 10000, ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; }; name = Debug; }; @@ -1045,6 +1068,7 @@ HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = mac/Info.plist; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_LDFLAGS = ( "-image_base", 100000000, @@ -1052,7 +1076,7 @@ 10000, ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; }; name = Release; }; @@ -1123,7 +1147,7 @@ LIBRARY_SEARCH_PATHS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios"; }; name = Debug; }; @@ -1145,7 +1169,7 @@ LIBRARY_SEARCH_PATHS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/platform/ios"; }; name = Release; }; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm index 6e1d42e9c0..fb3d672fe3 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm @@ -30,6 +30,7 @@ #import "AppDelegate.h" #import "RootViewController.h" #import "CCEAGLView.h" +#include "ConfigParser.h" @implementation AppController @@ -43,7 +44,9 @@ static AppDelegate s_sharedApplication; { // Override point for customization after application launch. - + + ConfigParser::getInstance()->readConfig(); + // Add the view controller's view to the window and display. window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds] diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist index 105ea833f0..8c1b27a35d 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Info.plist @@ -64,8 +64,9 @@ UISupportedInterfaceOrientations - UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm index 3eed8b36cd..ce34f8516e 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm @@ -26,6 +26,7 @@ #import "RootViewController.h" #import "cocos2d.h" #import "CCEAGLView.h" +#include "ConfigParser.h" @implementation RootViewController @@ -55,18 +56,32 @@ // Override to allow orientations other than the default portrait orientation. // This method is deprecated on ios6 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); + + if (ConfigParser::getInstance()->isLanscape()) { + return UIInterfaceOrientationIsLandscape( interfaceOrientation ); + }else{ + return UIInterfaceOrientationIsPortrait( interfaceOrientation ); + } + } // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead - (NSUInteger) supportedInterfaceOrientations{ #ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; + if (ConfigParser::getInstance()->isLanscape()) { + return UIInterfaceOrientationMaskLandscape; + }else{ + return UIInterfaceOrientationMaskPortraitUpsideDown; + } #endif } - (BOOL) shouldAutorotate { - return YES; + if (ConfigParser::getInstance()->isLanscape()) { + return YES; + }else{ + return NO; + } } - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m index c7052953c8..b1286e31be 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m @@ -1,9 +1,4 @@ -// -// main.m -// HelloLua -// -// Copyright __MyCompanyName__ 2011. All rights reserved. -// + #import diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib index 1698f76476..1d691c1d28 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib @@ -1,146 +1,827 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + 1060 + 13C64 + 5056 + 1265.19 + 697.40 + + com.apple.InterfaceBuilder.CocoaPlugin + 5056 + + + NSCustomObject + NSMenu + NSMenuItem + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + AppController + + + FirstResponder + + + NSApplication + + + AMainMenu + + + + Cocos-player + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + + Cocos-player + + + + About Cocos-player + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide Cocos-player + h + 1048576 + 2147483647 + + + + + + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit Cocos-player + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + File + + 1048576 + 2147483647 + + + submenuAction: + + + File + + + + ChangeProject + + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + + + + View + + 1048576 + 2147483647 + + + submenuAction: + + + View + + + + YES + YES + + + 2147483647 + + + + + + Portait + + 2147483647 + 1 + + + + + + Landscape + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + Actual (100%) + 0 + 1048576 + 2147483647 + 1 + + + 100 + + + + Zoom Out (75%) + 6 + 1048576 + 2147483647 + + + 75 + + + + Zoom Out (50%) + 5 + 1048576 + 2147483647 + + + 50 + + + + Zoom Out (25%) + 4 + 1048576 + 2147483647 + + + 25 + + + + + + + Control + + 2147483647 + + + submenuAction: + + + Control + + + + Relaunch + r + 1048576 + 2147483647 + + + + + + + + + Help + + 2147483647 + + + submenuAction: + + + Help + + _NSHelpMenu + + + + _NSMainMenu + + + NSFontManager + + + AppController + + + + NO + + + + hide: + + + + SGN-0p-7lH + + + + hideOtherApplications: + + + + iJd-Ba-eXG + + + + unhideAllApplications: + + + + DR8-By-ymv + + + + terminate: + + + + DyL-yF-GYq + + + + delegate + + + + 537 + + + + menu + + + + 650 + + + + orderFrontStandardAboutPanel: + + + + tSA-7z-LPk + + + + onChangeProject: + + + + KV1-nK-nLn + + + + onFileClose: + + + + 661 + + + + onScreenPortait: + + + + 667 + + + + onScreenLandscape: + + + + 647 + + + + onScreenZoomOut: + + + + yUj-fN-Rh7 + + + + onScreenZoomOut: + + + + yps-LZ-egB + + + + onScreenZoomOut: + + + + 654 + + + + onScreenZoomOut: + + + + DSu-if-D2T + + + + onRelaunch: + + + + XXg-eJ-YSn + + + + menu + + + + 550 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + + + + + + + GS6-Lb-ftA + + + + + + + + YN2-V8-ty0 + + + + + + + + + + + + + + + + HhF-Es-coQ + + + + + OzD-Nm-tPt + + + + + TOj-vg-cDm + + + + + + + + e98-We-UX5 + + + + + muN-Hw-eeZ + + + + + sH6-na-PTL + + + + + XG8-CE-veT + + + + + IqD-3v-zQT + + + + + GU5-eI-OTq + + + + + 7Z7-ot-jqY + + + + + 83 + + + + + + + + 81 + + + + + + + + + UUd-nT-0Tr + + + + + 611 + + + + + 295 + + + + + + Menu Item - View + + + 296 + + + + + + + + + + + + + Menu - View + + + 579 + + + + + 592 + + + + + 593 + + + + + 594 + + + + + 595 + + + + + pqR-xy-5ip + + + + + 596 + + + + + QB8-6D-hAr + + + + + Heh-SD-KHE + + + + + + + + ysx-9J-ekz + + + + + + + + hfu-OP-8X3 + + + + + 490 + + + + + + + + 491 + + + + + 420 + + + + + 536 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + 0 + IBCocoaFramework + YES + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {11, 11} + {10, 3} + + + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h index ac36e27952..411a256e9f 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h @@ -26,6 +26,8 @@ #include #include "AppDelegate.h" +void createSimulator(const char* viewName, float width, float height,bool isLandscape = true,float frameZoomFactor = 1.0f); + @interface AppController : NSObject { NSWindow *window; @@ -44,7 +46,7 @@ - (IBAction) onScreenPortait:(id)sender; - (IBAction) onScreenLandscape:(id)sender; - (IBAction) onScreenZoomOut:(id)sender; -- (IBAction) onReloadScript:(id)sender; +- (IBAction) onRelaunch:(id)sender; @end diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm index 5b5d279b8c..e3da120bb2 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm @@ -36,6 +36,7 @@ #include "glfw3.h" #include "glfw3native.h" #include "Runtime.h" +#include "ConfigParser.h" #include "cocos2d.h" @@ -45,6 +46,8 @@ bool g_landscape = false; cocos2d::Size g_screenSize; GLView* g_eglView = nullptr; +static AppController* g_nsAppDelegate=nullptr; + using namespace std; using namespace cocos2d; @@ -73,10 +76,12 @@ std::string getCurAppPath(void) if (args!=nullptr && [args count]>=2) { extern std::string g_resourcePath; g_resourcePath = [[args objectAtIndex:1]UTF8String]; + if (g_resourcePath.at(0) != '/') { + g_resourcePath=""; + } } - + g_nsAppDelegate =self; AppDelegate app; - [self createSimulator:[NSString stringWithUTF8String:"HelloLua"] viewWidth:960 viewHeight:640 factor:1.0]; Application::getInstance()->run(); // After run, application needs to be terminated immediately. [NSApp terminate: self]; @@ -115,15 +120,30 @@ std::string getCurAppPath(void) [window makeKeyAndOrderFront:self]; } +void createSimulator(const char* viewName, float width, float height,bool isLandscape,float frameZoomFactor) +{ + if(g_nsAppDelegate) + { + if((isLandscape && height > width) || (!isLandscape && width > height)) + { + float tmpvalue =width; + width = height; + height = tmpvalue; + } + + [g_nsAppDelegate createSimulator:[NSString stringWithUTF8String:viewName] viewWidth:width viewHeight:height factor:frameZoomFactor]; + } + +} - (void) createViewMenu { NSMenu *submenu = [[[window menu] itemWithTitle:@"View"] submenu]; - for (int i = SimulatorConfig::getInstance()->getScreenSizeCount() - 1; i >= 0; --i) + for (int i = ConfigParser::getInstance()->getScreenSizeCount() - 1; i >= 0; --i) { - SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(i); + SimulatorScreenSize size = ConfigParser::getInstance()->getScreenSize(i); NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:[NSString stringWithCString:size.title.c_str() encoding:NSUTF8StringEncoding] action:@selector(onViewChangeFrameSize:) keyEquivalent:@""] autorelease]; @@ -186,11 +206,11 @@ std::string getCurAppPath(void) height = w; } - int count = SimulatorConfig::getInstance()->getScreenSizeCount(); + int count = ConfigParser::getInstance()->getScreenSizeCount(); for (int i = 0; i < count; ++i) { bool bSel = false; - SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(i); + SimulatorScreenSize size = ConfigParser::getInstance()->getScreenSize(i); if (size.width == width && size.height == height) { bSel = true; @@ -271,18 +291,35 @@ std::string getCurAppPath(void) [self updateView]; } -- (IBAction) onReloadScript:(id)sender +- (void) launch:(NSArray*)args { - reloadScript(""); + NSURL *url = [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]]; + NSMutableDictionary *configuration = [NSMutableDictionary dictionaryWithObject:args forKey:NSWorkspaceLaunchConfigurationArguments]; + NSError *error = [[[NSError alloc] init] autorelease]; + [[NSWorkspace sharedWorkspace] launchApplicationAtURL:url + options:NSWorkspaceLaunchNewInstance + configuration:configuration error:&error]; +} + +- (void) relaunch:(NSArray*)args +{ + [self launch:args]; + [[NSApplication sharedApplication] terminate:self]; +} + +- (IBAction) onRelaunch:(id)sender +{ + NSArray* args=[[NSArray alloc] initWithObjects:@" ", nil]; + [self relaunch:args]; } - (IBAction) onViewChangeFrameSize:(id)sender { NSInteger index = [sender tag]; - if (index >= 0 && index < SimulatorConfig::getInstance()->getScreenSizeCount()) + if (index >= 0 && index < ConfigParser::getInstance()->getScreenSizeCount()) { - SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(index); + SimulatorScreenSize size = ConfigParser::getInstance()->getScreenSize(index); g_screenSize.width = size.width; g_screenSize.height = size.height; [self updateView]; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib index ad72d422f0..7ebed71aa1 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib @@ -1,83 +1,846 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + 1070 + 13C64 + 5056 + 1265.19 + 697.40 + + com.apple.InterfaceBuilder.CocoaPlugin + 5056 + + + IBNSLayoutConstraint + NSButton + NSButtonCell + NSCustomObject + NSTextField + NSTextFieldCell + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + WorkSpaceDialogController + + + FirstResponder + + + NSApplication + + + 3 + 2 + {{196, 240}, {650, 150}} + 544736256 + Change Project + NSWindow + + + + + 256 + + + + 268 + {{17, 113}, {626, 17}} + + + YES + + 68157504 + 272630784 + Choose Project Directory: + + .LucidaGrandeUI + 13 + 1044 + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + NO + 1 + + + + 268 + {{20, 83}, {516, 22}} + + + YES + + -1804599231 + 272630848 + + + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + + + NO + 1 + + + + 268 + {{538, 77}, {108, 32}} + + + {250, 750} + YES + + 67108864 + 134217728 + Select... + + + -2038284288 + 129 + + .LucidaGrandeUI + 13 + 16 + + + + 400 + 75 + + NO + + + + 268 + {{538, 22}, {109, 32}} + + + {250, 750} + YES + + 67108864 + 134217728 + Open Project + + + -2038284288 + 129 + + + + 400 + 75 + + NO + + + + 268 + {{13, 32}, {82, 32}} + + + {250, 750} + YES + + 67108864 + 134217728 + Cancel + + + -2038284288 + 129 + + + Gw + 400 + 75 + + NO + + + {650, 150} + + + + {{0, 0}, {1920, 1058}} + {10000000000000, 10000000000000} + NO + + + + NO + + + + textFieldProjectDirectory + + + + 307 + + + + window + + + + 308 + + + + browseProjectDirectory: + + + + 315 + + + + onOpenProject: + + + + OsS-1W-RIl + + + + onCancel: + + + + NeH-n8-xBM + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + + + + + + 2 + + + + + + + + + + 9 + 0 + + 9 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 4 + 0 + + 4 + 1 + 1 + + 29 + + 1000 + + 3 + 9 + 3 + NO + + + + 6 + 0 + + 6 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 5 + 0 + + 6 + 1 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + NO + + + + 4 + 0 + + 4 + 1 + 1 + + 39 + + 1000 + + 3 + 9 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 3 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + + + + + + 3 + + + + + + 7 + 0 + + 0 + 1 + 1 + + 622 + + 1000 + + 3 + 9 + 1 + NO + + + + + + 4 + + + + + 9 + + + + + + 7 + 0 + + 0 + 1 + 1 + + 516 + + 1000 + + 3 + 9 + 1 + NO + + + + + + 10 + + + + + 15 + + + + + + 7 + 0 + + 0 + 1 + 1 + + 96 + + 1000 + + 3 + 9 + 1 + NO + + + + + + 16 + + + + + 290 + + + + + + + + 291 + + + + + h9P-cE-Nn4 + + + + + + + + IHP-6G-mVo + + + + + iMi-xo-eWy + + + + + YJ1-Hw-Y6d + + + + + PG0-hY-geV + + + + + i6K-RE-2fe + + + + + gk1-TV-YZn + + + + + pS2-KY-JwZ + + + + + H3W-Ag-EM4 + + + + + uNq-ax-eLX + + + + + G4a-SP-Ne5 + + + + + V9F-80-0WS + + + + + jJo-kq-191 + + + + + LdE-9Z-oWz + + + + + 88D-6W-iEt + + + + + DKd-WY-ZYy + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + WorkSpaceDialogController + NSWindowController + + id + id + id + + + + browseProjectDirectory: + id + + + onCancel: + id + + + onOpenProject: + id + + + + NSButton + NSTextField + NSTextField + + + + buttonOpenProject + NSButton + + + textFieldProjectDirectory + NSTextField + + + textFieldScriptFile + NSTextField + + + + IBProjectSource + ./Classes/WorkSpaceDialogController.h + + + + + 0 + IBCocoaFramework + YES + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + YES + + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/build-cfg.json b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/build-cfg.json index e93fceb246..7a138cb477 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/build-cfg.json +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/build-cfg.json @@ -1,6 +1,7 @@ { "remove_res" : [ "src", - "res" + "res", + "config.json" ] } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 6e769d5586..dc70165991 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -112,6 +112,7 @@ mkdir "$(OutDir)\Resource\res" xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y +copy "$(ProjectDir)..\..\..\config.json" "$(OutDir)\Resource\config.json" /Y xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(OutDir)\Resource" /e /Y copy files @@ -167,6 +168,7 @@ mkdir "$(OutDir)\Resource\res" xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y +copy "$(ProjectDir)..\..\..\config.json" "$(OutDir)\Resource\config.json" /Y xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(OutDir)\Resource" /e /Y copy files @@ -177,14 +179,18 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + + + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters index 4d432f454a..4bbc2cd7a7 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters @@ -25,6 +25,12 @@ Classes + + Classes + + + Classes + @@ -42,6 +48,12 @@ Classes + + Classes + + + Classes + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp index e1083e80de..cb2671d0c4 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp @@ -10,21 +10,21 @@ using namespace std; string getIPAddress() { - WSADATA wsaData; - char name[155]={0}; - char *ip=nullptr; - PHOSTENT hostinfo; + WSADATA wsaData; + char name[155]={0}; + char *ip=nullptr; + PHOSTENT hostinfo; - if ( WSAStartup( MAKEWORD(2,0), &wsaData ) == 0 ) - { - if( gethostname ( name, sizeof(name)) == 0) - { - if((hostinfo = gethostbyname(name)) != NULL) - { - ip = inet_ntoa (*(struct in_addr *)*hostinfo->h_addr_list); - } - } - WSACleanup( ); - } - return ip; + if ( WSAStartup( MAKEWORD(2,0), &wsaData ) == 0 ) + { + if( gethostname ( name, sizeof(name)) == 0) + { + if((hostinfo = gethostbyname(name)) != NULL) + { + ip = inet_ntoa (*(struct in_addr *)*hostinfo->h_addr_list); + } + } + WSACleanup( ); + } + return ip; } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp index b7c9101397..8abd405c48 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp @@ -28,6 +28,7 @@ THE SOFTWARE. #include "glfw3native.h" #include "resource.h" #include "Runtime.h" +#include "ConfigParser.h" #include #include @@ -44,12 +45,11 @@ INT_PTR CALLBACK AboutDialogCallback(HWND hDlg, UINT message, WPARAM wParam, LPA void createViewMenu() { - HMENU menu = GetMenu(glfwGetWin32Window(g_eglView->getWindow())); - HMENU viewMenu = GetSubMenu(menu, 1); - - for (int i = SimulatorConfig::getInstance()->getScreenSizeCount() - 1; i >= 0; --i) + HMENU hSysMenu = GetSystemMenu(glfwGetWin32Window(g_eglView->getWindow()), FALSE); + HMENU viewMenu = GetSubMenu(hSysMenu, 8); + for (int i = ConfigParser::getInstance()->getScreenSizeCount() - 1; i >= 0; --i) { - SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(i); + SimulatorScreenSize size = ConfigParser::getInstance()->getScreenSize(i); wstring menuName; menuName.assign(size.title.begin(), size.title.end()); @@ -68,8 +68,8 @@ void createViewMenu() void updateMenu() { - HMENU menu = GetMenu(glfwGetWin32Window(g_eglView->getWindow())); - HMENU viewMenu = GetSubMenu(menu, 1); + HMENU hSysMenu = GetSystemMenu(glfwGetWin32Window(g_eglView->getWindow()), FALSE); + HMENU viewMenu = GetSubMenu(hSysMenu, 8); if (g_landscape) { @@ -91,12 +91,12 @@ void updateMenu() height = w; } - int count = SimulatorConfig::getInstance()->getScreenSizeCount(); + int count = ConfigParser::getInstance()->getScreenSizeCount(); for (int i = 0; i < count; ++i) { bool bSel = false; - SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(i); + SimulatorScreenSize size = ConfigParser::getInstance()->getScreenSize(i); if (size.width == width && size.height == height) { bSel = true; @@ -190,9 +190,9 @@ void onViewZoomOut(int viewMenuID) void onViewChangeFrameSize(int viewMenuID) { int index = viewMenuID - ID_VIEW_SIZE; - if (index >= 0 && index < SimulatorConfig::getInstance()->getScreenSizeCount()) + if (index >= 0 && index < ConfigParser::getInstance()->getScreenSizeCount()) { - SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(index); + SimulatorScreenSize size = ConfigParser::getInstance()->getScreenSize(index); g_screenSize.width = size.width; g_screenSize.height = size.height; updateView(); @@ -210,13 +210,34 @@ void shutDownApp() ::SendMessage(hWnd,WM_CLOSE,NULL,NULL); } +void reStart() +{ + PROCESS_INFORMATION info; + STARTUPINFO startup; + TCHAR szPath[128]={0}; + TCHAR *szCmdLine=NULL; + GetModuleFileName(NULL, szPath, sizeof(szPath)); + szCmdLine = GetCommandLine(); + GetStartupInfo(&startup); + BOOL bSucc = CreateProcess(szPath, szCmdLine, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &info); + if(bSucc) + { + ExitProcess(-1); + } +} /*@brief new windows process*/ LRESULT CALLBACK SNewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { int wmId, wmEvent; switch (message) { - case WM_COMMAND: + case WM_KEYDOWN: + if (wParam == VK_F5) + { + reStart(); + break; + } + case WM_SYSCOMMAND: { wmId = LOWORD(wParam); wmEvent = HIWORD(wParam); @@ -240,19 +261,19 @@ LRESULT CALLBACK SNewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar break; case ID_CONTROL_RELOAD: - reloadScript(""); + reStart(); break; case ID_HELP_ABOUT: onHelpAbout(); - + break; default: - if (wmId >= ID_VIEW_SIZE && wmId <= ID_VIEW_SIZE + SimulatorConfig::getInstance()->getScreenSizeCount() - 1) + if (wmId >= ID_VIEW_SIZE && wmId <= ID_VIEW_SIZE + ConfigParser::getInstance()->getScreenSizeCount() - 1) { onViewChangeFrameSize(wmId); break; } - return 0; + //return 0; } } break; @@ -280,13 +301,20 @@ INT_PTR CALLBACK AboutDialogCallback(HWND hDlg, UINT message, WPARAM wParam, LPA return (INT_PTR)FALSE; } -void createSimulator(const char* viewName, float width, float height, float frameZoomFactor) +void createSimulator(const char* viewName, float width, float height, bool isLandscape, float frameZoomFactor) { if (g_eglView) { return; } + if((isLandscape && height > width) || (!isLandscape && width > height)) + { + float tmpvalue =width; + width = height; + height = tmpvalue; + } + g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor); auto director = Director::getInstance(); director->setOpenGLView(g_eglView); @@ -300,7 +328,16 @@ void createSimulator(const char* viewName, float width, float height, float fram HWND hWnd=glfwGetWin32Window(g_eglView->getWindow()); HMENU hMenu = LoadMenu(GetModuleHandle(NULL), MAKEINTRESOURCE(IDR_MENU_COCOS)); - SetMenu(hWnd, hMenu); + HMENU hSysMenu = GetSystemMenu(hWnd, FALSE); + HMENU hviewMenu = GetSubMenu(hMenu,1); + HMENU hcontrolMenu = GetSubMenu(hMenu,2); + AppendMenu(hSysMenu,MF_SEPARATOR,0,NULL); + if (hSysMenu != INVALID_HANDLE_VALUE && hMenu != INVALID_HANDLE_VALUE) + { + AppendMenu(hSysMenu, MF_POPUP, (UINT)hviewMenu, TEXT("view")); + AppendMenu(hSysMenu, MF_POPUP, (UINT)hcontrolMenu, TEXT("control")); + } + //SetMenu(hWnd, hMenu); createViewMenu(); updateMenu(); diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h index fb09f1646d..abb12ab69d 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h @@ -28,6 +28,6 @@ THE SOFTWARE. /************************ @brief create Simulator *********************************/ -void createSimulator(const char* viewName, float width, float height,float frameZoomFactor = 1.0f); +void createSimulator(const char* viewName, float width, float height,bool isLandscape = true,float frameZoomFactor = 1.0f); #endif /* __PROJECT_CONFIG_H_ */ diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json index 8642706ca3..37fecf9b02 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json @@ -7,6 +7,10 @@ { "from": "../../../res", "to": "res" + }, + { + "from": "../../../config.json", + "to": "" } ], "must_copy_resources": [ diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc index b9f2307b2e..556a26c626 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc @@ -65,7 +65,7 @@ BEGIN END POPUP "&Control" BEGIN - MENUITEM "Reload", ID_CONTROL_RELOAD + MENUITEM "Restart(F5)", ID_CONTROL_RELOAD END POPUP "&Help" BEGIN diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp index c89ca37c5f..7684d909fd 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp @@ -1,12 +1,11 @@ #include "main.h" #include "AppDelegate.h" #include "cocos2d.h" -#include "SimulatorWindow.h" #include USING_NS_CC; // uncomment below line, open debug console -#define USE_WIN32_CONSOLE +//#define USE_WIN32_CONSOLE int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -40,7 +39,6 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, // create the application instance AppDelegate app; - createSimulator("HelloLua",960,640); int ret = Application::getInstance()->run(); diff --git a/templates/lua-template-runtime/runtime/config.json b/templates/lua-template-runtime/runtime/config.json index 5e705e14ec..59412228bf 100644 --- a/templates/lua-template-runtime/runtime/config.json +++ b/templates/lua-template-runtime/runtime/config.json @@ -1,6 +1,6 @@ { - "version":"v3-lua-runtime-1", - "zip_file_size":"20087009", + "version":"v3-lua-runtime-1.1.1", + "zip_file_size":"20854899", "repo_name":"cocos-runtime-bin", "repo_parent":"https://github.com/chukong/" } diff --git a/templates/lua-template-runtime/src/main.lua b/templates/lua-template-runtime/src/main.lua index 175e1ab0a5..8f3b086cdc 100644 --- a/templates/lua-template-runtime/src/main.lua +++ b/templates/lua-template-runtime/src/main.lua @@ -20,6 +20,7 @@ local function main() -- avoid memory leak collectgarbage("setpause", 100) collectgarbage("setstepmul", 5000) + cc.Director:getInstance():getOpenGLView():setDesignResolutionSize(480, 320, 0) cc.FileUtils:getInstance():addSearchResolutionsOrder("src"); cc.FileUtils:getInstance():addSearchResolutionsOrder("res"); local schedulerID = 0 diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj index 4301dbdbb6..f744a086b5 100644 --- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj +++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj @@ -90,13 +90,13 @@ 4 - + App.xaml.cs - + EditBox.xaml.cs - + MainPage.xaml.cs @@ -141,23 +141,6 @@ AppResources.Designer.cs - - - App.xaml - MSBuild:Compile - Designer - - - EditBox.xaml - MSBuild:Compile - Designer - - - MainPage.xaml - MSBuild:Compile - Designer - - {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} @@ -170,6 +153,23 @@ PreserveNewest + + + App.xaml + MSBuild:Compile + Designer + + + EditBox.xaml + MSBuild:Compile + Designer + + + MainPage.xaml + MSBuild:Compile + Designer + + + + - - - - diff --git a/tests/lua-empty-test/project/proj.android/jni/main.cpp b/tests/lua-empty-test/project/proj.android/jni/main.cpp index 26fe88c3a5..5199d12ab4 100644 --- a/tests/lua-empty-test/project/proj.android/jni/main.cpp +++ b/tests/lua-empty-test/project/proj.android/jni/main.cpp @@ -1,6 +1,6 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include diff --git a/tests/lua-empty-test/project/proj.android/project.properties b/tests/lua-empty-test/project/proj.android/project.properties index 0a6dc6664d..e135eeae59 100644 --- a/tests/lua-empty-test/project/proj.android/project.properties +++ b/tests/lua-empty-test/project/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../../../cocos/2d/platform/android/java +android.library.reference.1=../../../../cocos/platform/android/java diff --git a/tests/lua-tests/project/proj.android/AndroidManifest.xml b/tests/lua-tests/project/proj.android/AndroidManifest.xml index 4570848f92..1751925ae4 100644 --- a/tests/lua-tests/project/proj.android/AndroidManifest.xml +++ b/tests/lua-tests/project/proj.android/AndroidManifest.xml @@ -10,17 +10,16 @@ - + + + + - - - - diff --git a/tests/lua-tests/project/proj.android/jni/main.cpp b/tests/lua-tests/project/proj.android/jni/main.cpp index 26fe88c3a5..5199d12ab4 100644 --- a/tests/lua-tests/project/proj.android/jni/main.cpp +++ b/tests/lua-tests/project/proj.android/jni/main.cpp @@ -1,6 +1,6 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include diff --git a/tests/lua-tests/project/proj.android/project.properties b/tests/lua-tests/project/proj.android/project.properties index 0a6dc6664d..e135eeae59 100644 --- a/tests/lua-tests/project/proj.android/project.properties +++ b/tests/lua-tests/project/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../../../cocos/2d/platform/android/java +android.library.reference.1=../../../../cocos/platform/android/java diff --git a/tests/lua-tests/src/PhysicsTest/PhysicsTest.lua b/tests/lua-tests/src/PhysicsTest/PhysicsTest.lua index 7b9d9d715e..9043a42c8d 100644 --- a/tests/lua-tests/src/PhysicsTest/PhysicsTest.lua +++ b/tests/lua-tests/src/PhysicsTest/PhysicsTest.lua @@ -106,7 +106,7 @@ local function initWithLayer(layer, callback) local debug = false local function toggleDebugCallback(sender) debug = not debug - layer:getPhysicsWorld():setDebugDrawMask(debug and cc.PhysicsWorld.DEBUGDRAW_ALL or cc.PhysicsWorld.DEBUGDRAW_NONE) + cc.Director:getInstance():getRunningScene():getPhysicsWorld():setDebugDrawMask(debug and cc.PhysicsWorld.DEBUGDRAW_ALL or cc.PhysicsWorld.DEBUGDRAW_NONE) end layer.toggleDebug = function(self) toggleDebugCallback(nil) end; @@ -144,7 +144,7 @@ end local function onTouchBegan(touch, event) local location = touch:getLocation() - local arr = curLayer:getPhysicsWorld():getShapes(location) + local arr = cc.Director:getInstance():getRunningScene():getPhysicsWorld():getShapes(location) local body for _, obj in ipairs(arr) do @@ -162,7 +162,7 @@ local function onTouchBegan(touch, event) curLayer:addChild(mouse); local joint = cc.PhysicsJointPin:construct(mouse:getPhysicsBody(), body, location); joint:setMaxForce(5000.0 * body:getMass()); - curLayer:getPhysicsWorld():addJoint(joint); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():addJoint(joint); touch.mouse = mouse return true; @@ -253,7 +253,7 @@ local function makeTriangle(point, size, color, material) end local function PhysicsDemoClickAdd() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() local function onTouchEnded(touch, event) local location = touch:getLocation(); @@ -281,7 +281,7 @@ local function PhysicsDemoClickAdd() end local function PhysicsDemoLogoSmash() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() local logo_width = 188.0 @@ -327,8 +327,8 @@ local function PhysicsDemoLogoSmash() return bit.band(bit.rshift(logo_image[bit.rshift(x, 3) + y*logo_raw_length + 1], bit.band(bit.bnot(x), 0x07)), 1) end - curLayer:getPhysicsWorld():setGravity(cc.p(0, 0)); - curLayer:getPhysicsWorld():setUpdateRate(5.0); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():setGravity(cc.p(0, 0)); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():setUpdateRate(5.0); layer.ball = cc.SpriteBatchNode:create("Images/ball.png", #logo_image); layer:addChild(layer.ball); @@ -363,7 +363,7 @@ local function PhysicsDemoLogoSmash() end local function PhysicsDemoJoints() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() layer:toggleDebug(); @@ -384,6 +384,7 @@ local function PhysicsDemoJoints() node:setPosition(cc.p(0, 0)); layer:addChild(node); + local scene = cc.Director:getInstance():getRunningScene(); for i in range(0, 3) do for j in range(0, 3) do local offset = cc.p(VisibleRect:leftBottom().x + 5 + j * width + width/2, VisibleRect:leftBottom().y + 50 + i * height + height/2); @@ -396,7 +397,7 @@ local function PhysicsDemoJoints() sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); local joint = cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), offset); - curLayer:getPhysicsWorld():addJoint(joint); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -407,7 +408,7 @@ local function PhysicsDemoJoints() sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); local joint = cc.PhysicsJointFixed:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), offset); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -418,7 +419,7 @@ local function PhysicsDemoJoints() sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); local joint = cc.PhysicsJointDistance:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), cc.p(0, 0), cc.p(0, 0)); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -429,7 +430,7 @@ local function PhysicsDemoJoints() sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); local joint = cc.PhysicsJointLimit:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), cc.p(0, 0), cc.p(0, 0), 30.0, 60.0); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -440,7 +441,7 @@ local function PhysicsDemoJoints() sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); local joint = cc.PhysicsJointSpring:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), cc.p(0, 0), cc.p(0, 0), 500.0, 0.3); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -451,7 +452,7 @@ local function PhysicsDemoJoints() sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); local joint = cc.PhysicsJointGroove:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), cc.p(30, 15), cc.p(30, -15), cc.p(-30, 0)) - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -460,10 +461,10 @@ local function PhysicsDemoJoints() sp1:getPhysicsBody():setTag(DRAG_BODYS_TAG); local sp2 = makeBox(cc.p(offset.x + 30, offset.y), cc.size(30, 10)); sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); local joint = cc.PhysicsJointRotarySpring:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), 3000.0, 60.0); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -473,10 +474,10 @@ local function PhysicsDemoJoints() local sp2 = makeBox(cc.p(offset.x + 30, offset.y), cc.size(30, 10)); sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); local joint = cc.PhysicsJointRotaryLimit:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), 0.0, math.pi/2); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -486,10 +487,10 @@ local function PhysicsDemoJoints() local sp2 = makeBox(cc.p(offset.x + 30, offset.y), cc.size(30, 10)); sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); local joint = cc.PhysicsJointRatchet:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), 0.0, math.pi/2); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -499,10 +500,10 @@ local function PhysicsDemoJoints() local sp2 = makeBox(cc.p(offset.x + 30, offset.y), cc.size(30, 10)); sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); local joint = cc.PhysicsJointGear:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), 0.0, 2.0); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -512,10 +513,10 @@ local function PhysicsDemoJoints() local sp2 = makeBox(cc.p(offset.x + 30, offset.y), cc.size(30, 10)); sp2:getPhysicsBody():setTag(DRAG_BODYS_TAG); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); - curLayer:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp1:getPhysicsBody(), box, cc.p(sp1:getPosition()))); + scene:getPhysicsWorld():addJoint(cc.PhysicsJointPin:construct(sp2:getPhysicsBody(), box, cc.p(sp2:getPosition()))); local joint = cc.PhysicsJointMotor:construct(sp1:getPhysicsBody(), sp2:getPhysicsBody(), math.pi/2); - curLayer:getPhysicsWorld():addJoint(joint); + scene:getPhysicsWorld():addJoint(joint); layer:addChild(sp1); layer:addChild(sp2); @@ -530,7 +531,7 @@ local function PhysicsDemoJoints() end local function PhysicsDemoPyramidStack() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() local touchListener = cc.EventListenerTouchOneByOne:create(); @@ -568,7 +569,7 @@ local function PhysicsDemoPyramidStack() end local function PhysicsDemoRayCast() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() local function onTouchEnded(touch, event) @@ -590,7 +591,7 @@ local function PhysicsDemoRayCast() local eventDispatcher = layer:getEventDispatcher() eventDispatcher:addEventListenerWithSceneGraphPriority(touchListener, layer); - curLayer:getPhysicsWorld():setGravity(cc.p(0,0)); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():setGravity(cc.p(0,0)); local node = cc.DrawNode:create(); node:setPhysicsBody(cc.PhysicsBody:createEdgeSegment(cc.p(VisibleRect:leftBottom().x, VisibleRect:leftBottom().y + 50), cc.p(VisibleRect:rightBottom().x, VisibleRect:rightBottom().y + 50))) @@ -635,7 +636,7 @@ local function PhysicsDemoRayCast() return false end - curLayer:getPhysicsWorld():rayCast(func, point1, point2); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():rayCast(func, point1, point2); drawNode:drawSegment(point1, point3, 1, STATIC_COLOR); if point2.x ~= point3.x or point2.y ~= point3.y then @@ -653,7 +654,7 @@ local function PhysicsDemoRayCast() return true; end - curLayer:getPhysicsWorld():rayCast(func, point1, point2); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():rayCast(func, point1, point2); drawNode:drawSegment(point1, point3, 1, STATIC_COLOR); if point2.x ~= point3.x or point2.y ~= point3.y then @@ -668,7 +669,7 @@ local function PhysicsDemoRayCast() return true; end - curLayer:getPhysicsWorld():rayCast(func, point1, point2); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():rayCast(func, point1, point2); drawNode:drawSegment(point1, point2, 1, STATIC_COLOR); for _, p in ipairs(points) do @@ -692,7 +693,7 @@ local function PhysicsDemoRayCast() end local function PhysicsDemoOneWayPlatform() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() local touchListener = cc.EventListenerTouchOneByOne:create(); @@ -733,7 +734,7 @@ local function PhysicsDemoOneWayPlatform() end local function PhysicsDemoActions() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() local touchListener = cc.EventListenerTouchOneByOne:create() touchListener:registerScriptHandler(onTouchBegan, cc.Handler.EVENT_TOUCH_BEGAN) @@ -772,7 +773,7 @@ local function PhysicsDemoActions() end local function PhysicsDemoPump() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() layer:toggleDebug(); @@ -802,14 +803,14 @@ local function PhysicsDemoPump() eventDispatcher:addEventListenerWithSceneGraphPriority(touchListener, layer) local function update() - for _, body in ipairs(curLayer:getPhysicsWorld():getAllBodies()) do + for _, body in ipairs(cc.Director:getInstance():getRunningScene():getPhysicsWorld():getAllBodies()) do if body:getTag() == DRAG_BODYS_TAG and body:getPosition().y < 0.0 then body:getNode():setPosition(cc.p(VisibleRect:leftTop().x + 75, VisibleRect:leftTop().y + math.random() * 90, 0)); body:setVelocity(cc.p(0, 0)); end end - local gear = curLayer:getPhysicsWorld():getBody(1); + local gear = cc.Director:getInstance():getRunningScene():getPhysicsWorld():getBody(1); if gear then if distance ~= 0.0 then rotationV = rotationV + distance/2500.0; @@ -870,7 +871,7 @@ local function PhysicsDemoPump() cc.p(VisibleRect:leftBottom().x + 102, VisibleRect:leftBottom().y + 20) }; - local world = curLayer:getPhysicsWorld(); + local world = cc.Director:getInstance():getRunningScene():getPhysicsWorld(); -- small gear local sgear = cc.Node:create(); @@ -933,7 +934,7 @@ local function PhysicsDemoPump() end local function PhysicsDemoSlice() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() layer:toggleDebug() local sliceTag = 1; @@ -993,7 +994,7 @@ local function PhysicsDemoSlice() end local function onTouchEnded(touch, event) - curLayer:getPhysicsWorld():rayCast(slice, touch:getStartLocation(), touch:getLocation()); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():rayCast(slice, touch:getStartLocation(), touch:getLocation()); end local touchListener = cc.EventListenerTouchOneByOne:create(); @@ -1024,10 +1025,10 @@ end local function PhysicsDemoBug3988() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() layer:toggleDebug(); - curLayer:getPhysicsWorld():setGravity(cc.p(0, 0)); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():setGravity(cc.p(0, 0)); local ball = cc.Sprite:create("Images/YellowSquare.png"); ball:setPosition(cc.p(VisibleRect:center().x-100, VisibleRect:center().y)); @@ -1047,9 +1048,9 @@ local function PhysicsDemoBug3988() end local function PhysicsContactTest() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() - curLayer:getPhysicsWorld():setGravity(cc.p(0, 0)); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():setGravity(cc.p(0, 0)); local s = cc.size(VisibleRect:getVisibleRect().width, VisibleRect:getVisibleRect().height); layer.yellowBoxNum = 50; @@ -1290,11 +1291,11 @@ local function PhysicsContactTest() end local function PhysicsPositionRotationTest() - local layer = cc.Layer:createWithPhysics() + local layer = cc.Layer:create() local function onEnter() layer:toggleDebug() - curLayer:getPhysicsWorld():setGravity(cc.p(0, 0)); + cc.Director:getInstance():getRunningScene():getPhysicsWorld():setGravity(cc.p(0, 0)); local touchListener = cc.EventListenerTouchOneByOne:create() touchListener:registerScriptHandler(onTouchBegan, cc.Handler.EVENT_TOUCH_BEGAN) @@ -1350,9 +1351,10 @@ end function PhysicsTest() cclog("PhysicsTest") - local scene = cc.Scene:create() + local scene = cc.Scene:createWithPhysics() + Helper.usePhysics = true Helper.createFunctionTable = { PhysicsDemoLogoSmash, PhysicsDemoPyramidStack, diff --git a/tests/lua-tests/src/helper.lua b/tests/lua-tests/src/helper.lua index 265cc8bce3..0e242a1c43 100644 --- a/tests/lua-tests/src/helper.lua +++ b/tests/lua-tests/src/helper.lua @@ -83,7 +83,12 @@ function Helper.restartAction() end function Helper.newScene() - local scene = cc.Scene:create() + local scene + if Helper.usePhysics then + scene = cc.Scene:createWithPhysics() + else + scene = cc.Scene:create() + end Helper.currentLayer = Helper.createFunctionTable[Helper.index]() scene:addChild(Helper.currentLayer) scene:addChild(CreateBackMenuItem()) diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index 2719d45f63..ff238ce440 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -117,7 +117,7 @@ def main(): print "Before checkout: git clean -xdf -f" os.system("git clean -xdf -f") #fetch pull request to local repo - git_fetch_pr = "git fetch origin pull/" + str(pr_num) + "/merge" + git_fetch_pr = "git fetch origin pull/" + str(pr_num) + "/head" ret = os.system(git_fetch_pr) if(ret != 0): return(2) diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index f5b532a497..26acb84b6f 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -13,8 +13,8 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android +cocos_flags = -DANDROID cxxgenerator_headers = @@ -119,7 +119,8 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS Component::[serialize], Console::[addCommand], ParallaxNode::[getParallaxArray], - TileMapAtlas::[getTGAInfo] + TileMapAtlas::[getTGAInfo], + Sprite3D::[getMesh] rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame], ProgressTimer::[setReverseProgress=setReverseDirection], diff --git a/tools/tolua/cocos2dx_extension.ini b/tools/tolua/cocos2dx_extension.ini index 8c7de812c8..2f18460525 100644 --- a/tools/tolua/cocos2dx_extension.ini +++ b/tools/tolua/cocos2dx_extension.ini @@ -13,9 +13,9 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s +cocos_headers = -I%(cocosdir)s -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT +cocos_flags = -DANDROID cxxgenerator_headers = diff --git a/tools/tolua/cocos2dx_physics.ini b/tools/tolua/cocos2dx_physics.ini index 8a16423d8e..d2c3549161 100644 --- a/tools/tolua/cocos2dx_physics.ini +++ b/tools/tolua/cocos2dx_physics.ini @@ -13,8 +13,9 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/cocos/physics -cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT -DCC_USE_PHYSICS=1 +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android + +cocos_flags = -DANDROID cxxgenerator_headers = diff --git a/tools/tolua/cocos2dx_spine.ini b/tools/tolua/cocos2dx_spine.ini index 190922ccc4..783e2a052e 100644 --- a/tools/tolua/cocos2dx_spine.ini +++ b/tools/tolua/cocos2dx_spine.ini @@ -13,9 +13,9 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/ui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s/cocos/platform/android -cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT +cocos_flags = -DANDROID cxxgenerator_headers = diff --git a/tools/tolua/cocos2dx_studio.ini b/tools/tolua/cocos2dx_studio.ini index 76553f7dda..9a2b752ce9 100644 --- a/tools/tolua/cocos2dx_studio.ini +++ b/tools/tolua/cocos2dx_studio.ini @@ -16,9 +16,9 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/ui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s +cocos_headers = -I%(cocosdir)s/external -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s/cocos/platform/android -cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT +cocos_flags = -DANDROID cxxgenerator_headers = diff --git a/tools/tolua/cocos2dx_ui.ini b/tools/tolua/cocos2dx_ui.ini index 0703e76093..1befd7db27 100644 --- a/tools/tolua/cocos2dx_ui.ini +++ b/tools/tolua/cocos2dx_ui.ini @@ -16,9 +16,9 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/ui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s/cocos/platform/android -cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT +cocos_flags = -DANDROID cxxgenerator_headers =